5236 Commits

Author	SHA1	Message	Date
LOuroboros	5dd143f19d	Applied Blackforest's changes to General_AffectionHangedOn	2022-08-25 13:07:52 -03:00
LOuroboros	1fc63c3431	More review corrections	2022-08-25 11:52:21 -03:00
DizzyEggg	a0ec8a5a80	4 digit hp in battle	2022-08-25 16:40:56 +02:00
LOuroboros	11d6ae4820	Renamed the GetLeadMonFriendshipScore constants	2022-08-25 11:34:37 -03:00
LOuroboros	e792fae415	Review corrections ... -Simplified the affection mechanics' battle scripts. -Corrected the value seting inside CalcCritChanceStage. -Simplified the checks inside Cmd_adjustdamage -Simplified the contents of GetLeadMonFriendshipScore now that a more general function to do the same thing was added. -Added constants for the values returned by GetMonFriendshipScore.	2022-08-25 10:45:57 -03:00
LOuroboros	1f4ef2a0fb	Added constants for GetLeadMonFriendshipScore	2022-08-25 10:40:56 -03:00
ghoulslash	f736766c94	Merge pull request #2238 from DizzyEggg/multi ... Wild multi battles and doubles 2 vs 1 interface	2022-08-25 08:47:02 -04:00
Eduardo Quezada	af137c9b9d	Multiple changes ... - Simplified LoadSpecialPokePic - Changed all checks flag checks to houldShowFemaleDifferences	2022-08-25 03:42:41 -04:00
LOuroboros	7b7ba93d45	Fixed P_UPDATED_ABILITIES's comment	2022-08-24 20:35:13 -03:00
crater-git	6012731f27	Removed redundant ifdef	2022-08-24 19:31:55 -04:00
DizzyEggg	91b76e2e4f	quash pr clean up	2022-08-24 23:39:34 +02:00
DizzyEggg	06b4548603	Merge branch 'SonikkuA-DatH-Quashh' of https://github.com/SonikkuA-DatH/pokeemerald-expansion into quash	2022-08-24 23:35:42 +02:00
DizzyEggg	7aa55f2753	better interface 1 player mon in double	2022-08-24 23:00:21 +02:00
crater-git	940f9f1726	Moved branch defs to config.h, now only for compat	2022-08-24 16:10:32 -04:00
DizzyEggg	e3ab439ec0	Fix multi wild battles	2022-08-24 21:56:24 +02:00
LOuroboros	b7ca63d151	Implemented Ice Face ... Thanks to Benício Gonçalves#3454 who provided a base to work with.	2022-08-24 13:45:34 -03:00
Blackforest92	07a07ddc8d	Update to latest master branch + allow Reveal Glass to work with Enamorus	2022-08-24 15:00:48 +07:00
Eduardo Quezada D'Ottone	21867a6061	Merge branch 'master' into AI	2022-08-24 01:07:35 -04:00
Eduardo Quezada	eea718cfc6	Placeholder moves can't be used in battle.	2022-08-24 00:30:49 -04:00
Eduardo Quezada	56a2e91518	Updated move limitations	2022-08-23 22:40:04 -04:00
Ct11217	67f473f38b	Fixed recommended issues. ... Added additional comments. Reordered switching ladder in ShouldSwitch() function. Functions that can specify a specific party mon to switch into need to come first.	2022-08-23 19:49:54 -06:00
crater-git	45511fcc44	Reworked TMHM into expandable list format	2022-08-23 21:44:42 -04:00
Eduardo Quezada	1f5adf93c7	Cleaned up use of configs be almost exclusively preproc functions	2022-08-23 21:00:08 -04:00
GriffinR	3771abbe08	Fix names and constant usage for union room classes	2022-08-23 12:44:07 -04:00
Eduardo Quezada	7c7887aa65	Moved ABILITY_NAME_LENGTH back to include/constants/global.h to keep in line with upstream pret	2022-08-23 08:25:27 -04:00
DizzyEggg	05ec8fb182	AI knows Party mons	2022-08-23 11:58:17 +02:00
Eduardo Quezada	afcc1178b2	Merge remote-tracking branch 'pret/master' into MergedBranchUltimate ... # Conflicts: # data/battle_ai_scripts.s # data/battle_scripts_1.s # include/battle_controllers.h # include/battle_script_commands.h # include/battle_util.h # include/constants/battle_script_commands.h # include/constants/global.h # include/decompress.h # src/battle_anim_effects_1.c # src/battle_anim_normal.c # src/battle_anim_poison.c # src/battle_anim_water.c # src/battle_arena.c # src/battle_controller_link_opponent.c # src/battle_controller_link_partner.c # src/battle_controller_opponent.c # src/battle_controller_player.c # src/battle_controller_player_partner.c # src/battle_controller_recorded_opponent.c # src/battle_controller_recorded_player.c # src/battle_controller_safari.c # src/battle_controller_wally.c # src/battle_gfx_sfx_util.c # src/battle_interface.c # src/battle_main.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c # src/berry.c # src/data/trainers.h # src/decompress.c # src/field_effect.c # src/hall_of_fame.c # src/overworld.c # src/pokeball.c # src/pokemon.c # src/pokemon_icon.c # src/pokemon_storage_system.c # src/scrcmd.c	2022-08-22 20:30:45 -04:00
DizzyEggg	327782646b	Save party mons ai	2022-08-23 01:07:25 +02:00
Eduardo Quezada	75ac960365	Introduced P_NEW_POKEMON, which will disable all Gen4+ Pokémon and Forms	2022-08-22 17:27:21 -04:00
GriffinR	898ec580ae	Merge pull request #1737 from GriffinRichards/lock-unlock ... Clean up lock/unlock anim movement	2022-08-22 01:30:33 -04:00
GriffinR	30906762ed	Merge pull request #1740 from AsparagusEduardo/pret_stringTabs ... Fixed inconsistent use of white space for scripts, .c files and .h files.	2022-08-20 23:03:59 -04:00
GriffinR	261b0ff118	Standardize judgement vs judgment spelling	2022-08-20 22:58:46 -04:00
GriffinR	9e175a1037	Merge pull request #1735 from GriffinRichards/arena-const ... Add some missing battle arena constants	2022-08-20 22:54:32 -04:00
Eduardo Quezada	76d2d92abb	Merge branch 'pretmaster' into pret_clean2	2022-08-20 12:43:09 -04:00
GriffinR	1685365cd4	Merge pull request #1727 from AsparagusEduardo/pret_clean ... Cleanup from https://github.com/pret/pokefirered/pull/532	2022-08-19 21:27:55 -04:00
Martin Griffin	d57442a511	Decimal paletteNums	2022-08-19 17:05:22 +01:00
GriffinR	c2d5dd2a1f	Additional battle anim sync	2022-08-19 11:51:13 -04:00
Martin Griffin	5719a7f7bc	Use static inline instead of extern inline for modern	2022-08-19 15:47:50 +01:00
Martin Griffin	6fed961ed6	Write palette IDs in hex	2022-08-19 15:29:35 +01:00
Blackforest92	a9d09bcd17	Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into Legends_Arceus_Expansion	2022-08-19 17:53:01 +07:00
Blackforest92	00a827b3fb	Add PLA pokemon to Form Species Table, add Kleavor's graphics	2022-08-19 17:47:34 +07:00
Eduardo Quezada	3bc2cf921c	Sync src/battle_controllers.c with pokefirered	2022-08-18 14:30:22 -04:00
Eduardo Quezada	59f89bde9e	Misc cleanup	2022-08-18 14:23:45 -04:00
Ct11217	a4b53126f6	Added AI_FLAG_ACE_POKEMON ... When this flag is set, the trainer will have an "Ace" pokemon that will always be sent out last. If this flag is set, the last Pokemon in the party will be considered the "Ace" Pokemon. This is similar to the gym leader functionality found in Sword & Shield.	2022-08-17 18:23:12 -06:00
Eduardo Quezada	5933c42439	Synced Route 4 and 10's MapSec labels	2022-08-16 18:23:37 -04:00
GriffinR	26734d80f3	Merge pull request #1728 from AsparagusEduardo/pret_monDataEnum ... Convert MON_DATA constants into enum to ease editing and addition of fields.	2022-08-15 18:51:32 -04:00
Eduardo Quezada	0149f420f9	Corrected comment	2022-08-15 17:36:55 -04:00
Eduardo Quezada	e8a05e92e4	Corrected additional inconsistent uses of whitespace	2022-08-15 17:04:34 -04:00
tustin2121	ec73158f16	Moving documentation comments per request ... from the discord chat.	2022-08-15 16:37:38 -04:00
tustin2121	1cb659df8c	Renaming Script Contexts ... - Determined how the various script contexts were used and renamed accordingly. - ScriptContext2_Enable/Disable => Lock/UnlockPlayerFieldControls - The sole purpose of the flag is to make sure the player can't move around in the overworld. It has nothing to do with script contexts. - ScriptContext1 => ScriptContext - It is the global script context used to set up scripts which run over many frames. - ScriptContext2_RunNewScript => RunScriptImmediately - ScriptContext2's sole purpose was to run scripts immediately and in a separate context, usually while the global context is waiting for things like map loads or screen changes.	2022-08-15 15:18:12 -04:00
GriffinR	5515e328b2	Clean up lock/unlock anim movement	2022-08-12 21:18:10 -04:00
GriffinR	2df6cc1820	Merge pull request #1730 from GriffinRichards/sync-naming-screen ... Clean up naming screen graphics	2022-08-12 11:05:55 -04:00
GriffinR	574cf1ddb9	Merge pull request #1725 from GriffinRichards/security-signature ... Sector security -> signature	2022-08-12 10:47:10 -04:00
Ct11217	b95e450cb6	Added corner case logic for AI Switching. ... 1. Refactor Perish Song 2. Yawn 3. Secondary Damage (Leech Seed, Cursed etc). 4. Added Preliminary logic to help AI be smarter against semi-invulnerable Added AI logic regarding abilities that benefit from switching 1. Natural Cure 2. Regenerator	2022-08-11 22:48:36 -06:00
GriffinR	cf4d05e9e7	Fix typo	2022-08-11 12:09:38 -04:00
GriffinR	63468f9fcb	Add some missing battle arena constants	2022-08-11 12:02:56 -04:00
GriffinR	286a99eb1d	Merge pull request #1723 from GriffinRichards/fix-impassable ... MapGridIsImpassableAt -> MapGridGetCollisionAt, and add fixes	2022-08-10 21:28:14 -04:00
GriffinR	bfdbbad468	Split naming screen palettes/graphics, use correct image palettes, clean up	2022-08-09 09:27:28 -04:00
Eduardo Quezada	1fd1870a13	Moved enum to include/pokemon.h	2022-08-08 18:40:47 -04:00
Eduardo Quezada	75d52dc762	Convert MON_DATA constants into enum to ease editing and addition of fields.	2022-08-08 18:18:17 -04:00
Eduardo Quezada	4b08a511c3	Cleanup from https://github.com/pret/pokefirered/pull/532	2022-08-07 22:40:15 -04:00
GriffinR	2487ddb128	Sector security -> signature	2022-08-05 10:42:31 -04:00
DizzyEggg	c991131b75	Change language stuff based on the french decomp	2022-08-04 11:53:16 +02:00
GriffinR	e5c36cd745	MapGridIsImpassableAt -> MapGridGetCollisionAt, and add fixes	2022-08-03 14:21:13 -04:00
GriffinR	79384ec9f3	Merge pull request #1702 from GriffinRichards/clean-psn ... Clean up field_poison.c	2022-08-02 13:20:49 -04:00
GriffinR	99a37b5aa5	Merge pull request #1717 from mrgriffin/trainer-party-macro ... Macros for keeping .partyFlags, .partySize, and .party in sync	2022-08-02 13:11:43 -04:00
ExpoSeed	807c3fd17f	Delete item and ability defines in configs	2022-08-02 00:28:42 -05:00
ExpoSeed	49da2ee53f	Remove all the ifdefs for BATTLE_ENGINE, ITEM_EXPANSION, and POKEMON_EXPANSION	2022-08-02 00:15:55 -05:00
GriffinR	79c5a5983e	Merge pull request #1721 from AsparagusEduardo/pret_clean2 ... Companion PR to pokefirered #525	2022-08-01 16:57:40 -04:00
Eduardo Quezada	c6cdb2a281	Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge	2022-07-31 22:57:46 -04:00
GriffinR	5101811407	Merge pull request #1719 from AsparagusEduardo/pret_cleanBattleScriptCommands ... Further cleaning after comparing with pokefirered	2022-07-30 09:09:23 -04:00
Eduardo Quezada	40805fffc0	Space cleanup	2022-07-29 21:28:39 -04:00
Eduardo Quezada	5d4b76c0ba	Review changes from pokefirered #524	2022-07-29 17:00:07 -04:00
Eduardo Quezada	9dc64b67cd	Review changes	2022-07-29 15:38:23 -04:00
Eduardo Quezada	01558ff8f3	Struct pointers star standarizing	2022-07-29 11:15:33 -04:00
Eduardo Quezada	13672680b0	void pointer standarized	2022-07-29 10:52:35 -04:00
Eduardo Quezada	7b3401ee27	Standarized use of star in pointer types	2022-07-29 10:17:58 -04:00
Eduardo Quezada	9caca17064	Cleanup by syncing src/battle_script_commands.c with pokefirered	2022-07-29 09:43:16 -04:00
Jaizu	7a8c28ccca	Remove duplicated CB2_InitCopyrightScreenAfterBootup	2022-07-29 10:52:36 +02:00
Greenphx9	05cbd6a906	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into 16-letter-move-names	2022-07-29 18:49:25 +10:00
LOuroboros	b9c83710c4	Sync this branch's include/constants/moves.h with the BE's	2022-07-28 11:12:28 -03:00
Eduardo Quezada	09af7422d5	Further cleaning after comparing with pokefirered ... STAT_BUFF changed to STAT_CHANGE, as it also uses debuffs	2022-07-28 01:27:05 -04:00
Martin Griffin	2380d13a43	Macros for keeping .partyFlags, .partySize, and .party in sync	2022-07-27 23:25:37 +01:00
GriffinR	1da46a4bbc	Merge pull request #1715 from AsparagusEduardo/pret_docBooleans ... Documented boolean uses	2022-07-27 12:09:02 -04:00
Eduardo Quezada	e1c15a9cf6	Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge	2022-07-27 08:16:10 -04:00
LOuroboros	b59f7aed7f	Added a constant for NPC trainer name length (#1712)	2022-07-25 22:59:13 -04:00
Eduardo Quezada	a37d8b1346	Documented boolean uses	2022-07-25 14:59:14 -04:00
LOuroboros	032b7b2ab9	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into yourAffection	2022-07-25 10:24:19 -03:00
Eduardo Quezada D'Ottone	bfb86fdc86	Config for Gen 3 faint switch mechanics	2022-07-24 14:57:47 -04:00
Eduardo Quezada	e96c9c87fa	Merge remote-tracking branch 'RHH/item_expansion' into RHH_masterMerge ... # Conflicts: # src/battle_script_commands.c # src/data/pokemon/base_stats.h	2022-07-22 23:38:52 -04:00
Eduardo Quezada	231727d02b	Merge remote-tracking branch 'RHH/pokemon_expansion' into RHH_masterMerge ... # Conflicts: # asm/macros/event.inc # data/specials.inc # include/constants/species.h # src/data/pokemon/base_stats.h	2022-07-22 23:33:04 -04:00
Eduardo Quezada	f3bebcd12c	Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge ... # Conflicts: # include/battle_anim.h # include/global.h # include/pokemon.h # src/battle_message.c # src/battle_script_commands.c # src/data/pokemon/base_stats.h	2022-07-22 22:57:02 -04:00
ghoulslash	1260666c91	Merge pull request #1911 from AsparagusEduardo/PE_breedOverrides ... Added Egg breeding species overrides.	2022-07-22 14:05:14 -04:00
ghoulslash	3a77b52bad	Merge pull request #2194 from AsparagusEduardo/BE_pretmerge ... Battle Engine pret merge	2022-07-22 14:00:40 -04:00
Eduardo Quezada D'Ottone	56b9a50109	Merge remote-tracking branch 'RHH/battle_engine' into BE_plusMinus ... # Conflicts: # include/constants/battle_config.h	2022-07-21 16:28:16 -04:00
ghoulslash	49a932a892	Merge pull request #2205 from AsparagusEduardo/BE_LightThatBurnsTheSky ... Fixed Light That Burns The Sky not using the calculated damage category	2022-07-21 16:14:38 -04:00
ghoulslash	30a494f964	Merge pull request #2197 from AsparagusEduardo/BE_explosion ... Config for Explosion halving defense	2022-07-21 16:11:32 -04:00
ghoulslash	504600c996	Merge pull request #2201 from AsparagusEduardo/BE_sturdy ... Config for Sturdy's Gen5+ effect.	2022-07-21 16:09:01 -04:00
Eduardo Quezada D'Ottone	e4ae280ca6	Fixed calls to IsZMove	2022-07-21 15:32:14 -04:00
Eduardo Quezada D'Ottone	25397e5794	Fixed Light That Burns The Sky not using the calculated damage category ... Also: - Modified move defines to ease with future move expansion. - Enabled Instruct's check for Z Moves in AI_CheckBadMove.	2022-07-21 15:13:00 -04:00
Eduardo Quezada D'Ottone	0f3fdd410a	Config for Sturdy's Gen5+ effect.	2022-07-20 13:06:41 -04:00
Eduardo Quezada D'Ottone	e14afd8957	Added Growth's Atk. raise to the its configuration, as that was also introduced in Gen 5.	2022-07-20 10:33:18 -04:00
Eduardo Quezada D'Ottone	cb34119711	Config for Charge raising Sp. Def.	2022-07-20 10:13:18 -04:00
Eduardo Quezada D'Ottone	fe63dafcc1	Merge branch 'battle_engine' into BE_pretmerge ... # Conflicts: # src/battle_anim_fire.c # src/battle_controller_player.c	2022-07-20 08:50:30 -04:00
ghoulslash	99424e1aaf	Update include/battle.h ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-07-19 19:03:05 -04:00
ghoulslash	2b5bb9f6e4	move gSwapDamagecategory to battle struct, use GetSplitBasedOnStats for photon geyser check	2022-07-19 18:24:53 -04:00
Eduardo Quezada D'Ottone	1cfb267b34	Config for Explosion halving defense	2022-07-18 13:10:27 -04:00
Eduardo Quezada D'Ottone	1dcbf59686	Config for Plus and Minus interaction	2022-07-18 08:11:02 -04:00
ghoulslash	6b84a9f0b3	merge w be	2022-07-17 12:40:43 -04:00
Eduardo Quezada D'Ottone	e791cf90ad	Merge tag 'pretmaster' into BE_pretmerge2 ... # Conflicts: # data/battle_anim_scripts.s # include/battle_anim.h # include/battle_controllers.h # include/battle_interface.h # include/battle_main.h # include/battle_setup.h # include/constants/battle_anim.h # include/constants/battle_string_ids.h # src/battle_ai_switch_items.c # src/battle_anim_fire.c # src/battle_anim_normal.c # src/battle_controllers.c # src/battle_dome.c # src/battle_gfx_sfx_util.c # src/battle_interface.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c # src/pokemon.c	2022-07-15 12:58:46 -04:00
Eduardo Quezada D'Ottone	f78bb4fb84	Merge remote-tracking branch 'pret/master' into item_expansion ... # Conflicts: # src/battle_script_commands.c # src/data/pokemon/base_stats.h	2022-07-12 17:42:32 -04:00
Eduardo Quezada D'Ottone	c69275f373	Merge remote-tracking branch 'pret/master' into PE_pretmerge ... # Conflicts: # include/battle_anim.h # include/pokemon.h # src/data/pokemon/base_stats.h	2022-07-12 17:20:49 -04:00
GriffinR	30a5821997	Merge pull request #1705 from sphericalice/move-unavailable ... Introduces a MOVE_UNAVAILABLE constant	2022-07-12 11:32:57 -04:00
sphericalice	186f2c0232	Introduce a MOVE_UNAVAILABLE constant	2022-07-11 15:18:13 +01:00
Greenphx9	4294682d8c	16-letter move names ... Move define, add spaces between comments, fix include if TRUE -> if set to TRUE Co-Authored-By: LOuroboros <lunosouroboros@gmail.com>	2022-07-11 12:49:30 +10:00
LOuroboros	a1004485c5	Relocated TYPE_NAME_LENGTH and ABILITY_NAME_LENGTH	2022-07-10 20:08:28 -03:00
GriffinR	06dc93fc2f	Clean up field_poison.c	2022-07-06 21:04:54 -04:00
Blackforest92	ff861ff963	Add some of Legends Arceus battle sprites	2022-07-04 12:28:40 +07:00
ghoulslash	fac6f21ed0	AI_EFFECTIVENESS_xY are enums	2022-07-03 16:28:34 -04:00
ghoulslash	e4bf99d777	merge w be	2022-07-03 16:20:05 -04:00
LOuroboros	c04f7d5e5b	Changed B_TELEPORT_BEHAVIOR's description comment	2022-07-03 13:51:34 -03:00
LOuroboros	8f728dcd79	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into teleport	2022-07-03 13:49:18 -03:00
Blackforest92	8c88e8a9b7	Legends Arceus Pokemon 95% Finished	2022-07-03 17:15:37 +07:00
ghoulslash	02a62e245b	Merge pull request #1992 from AsparagusEduardo/BE_WhiteOutMoney ... Config for lost money after losing a battle	2022-07-01 11:58:36 -04:00
ghoulslash	6cf0620f93	Merge pull request #2159 from Sneed69/trap-move-arrays ... Trap move battle string related code cleanup	2022-07-01 11:07:28 -04:00
sneed	c1af418340	define B_MSG_WRAPPED_ constants	2022-07-01 17:52:46 +03:00
ghoulslash	fc2cfd8c9d	Merge pull request #2136 from LOuroboros/pePretMerge ... Pret merge for the pokemon_expansion	2022-07-01 09:22:55 -04:00
ghoulslash	a349462b78	Merge pull request #2134 from LOuroboros/bePretMerge ... Pret merge for the battle_engine	2022-07-01 09:21:51 -04:00
ghoulslash	42f3cccdbe	Merge pull request #2154 from HamishSinclair/poltergeist ... add poltergeist animation	2022-07-01 09:19:49 -04:00
ghoulslash	f4918222e8	Merge pull request #2156 from Sneed69/ai_3rd_type ... Type effectivess related AI bugfixes	2022-07-01 09:09:12 -04:00
ghoulslash	80ac427443	Merge pull request #2160 from Sneed69/ignore-mystery-type-3 ... IS_BATTLER_OF_TYPE ignores third type if it's Mystery	2022-07-01 08:55:08 -04:00
LOuroboros	aa5c6a3f01	Implemented affection-now-friendship mechanics	2022-06-22 00:18:01 -03:00
GriffinR	57222323c1	Merge pull request #1678 from GriffinRichards/const-frontier ... Add some battle frontier constant usage	2022-06-18 10:22:58 -04:00
GriffinR	4660f8c88b	Document battle tower TV show	2022-06-14 09:37:39 -04:00
GriffinR	7143865f6f	Add some battle frontier constant usage	2022-06-09 12:57:28 -04:00
GriffinR	1f540845cb	Merge pull request #1675 from GriffinRichards/doc-arg ... Document generic arguments	2022-06-09 11:11:02 -04:00
ghoulslash	b33a8b0cb4	move ai score calc to STATE_TURN_START_RECORD so AI can consider move selection for item use	2022-06-05 11:09:04 -04:00
ghoulslash	c694e0cb90	merge w be	2022-06-05 08:22:24 -04:00
GriffinR	bc2dbd772e	Add warning to NUM_OBJ_EVENT_GFX	2022-06-03 16:18:34 -04:00
GriffinR	1ca1bff81c	Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into doc-arg	2022-06-03 15:43:21 -04:00
GriffinR	34438e6bc4	Continue documenting generic arguments	2022-06-03 15:38:03 -04:00
Sneed69	c60de5055d	remove IsMoveWithoutAnimation	2022-06-03 17:42:42 +03:00
sphericalice	380cb46919	Correct CreateRegionMapPlayerIcon's argument names ... Correct CreateRegionMapPlayerIcon's argument names in include/region_map.h	2022-06-03 15:04:52 +01:00
sphericalice	35bdaccedc	Add the HEAL_LOCATION_NONE constant	2022-06-03 14:59:01 +01:00
sneed	5934acbdc5	IS_BATTLER_OF_TYPE ignores 3rd type if mystery	2022-06-01 22:21:32 +03:00
sneed	86b436782a	trap move related code cleanup	2022-06-01 22:01:50 +03:00
GriffinR	a8437493c1	Document generic argument names in battle anim palettes	2022-06-01 12:25:01 -04:00
GriffinR	5e6d8a77e4	Document some generic argument names	2022-05-31 14:34:25 -04:00
sneed	2e855b204a	ai accounts for a third type	2022-05-29 04:55:37 +03:00
Martin Griffin	1cc59acca9	Static assertion for size of save structs	2022-05-25 19:48:42 +01:00
sneed	c8e08edbae	rename item1 and item2 in BaseStats	2022-05-23 19:10:24 +03:00
hamish	307d5d93c4	add potlergeist animation	2022-05-23 08:53:08 -04:00
sneed	ce468a0903	add macros for handling form base stats	2022-05-23 01:04:21 +03:00
Eduardo Quezada D'Ottone	f2c509eab7	Merge pull request #2151 from Sneed69/dummy_abilities ... Add dummy abilities to make base stats header smaller	2022-05-22 13:27:27 -04:00
sneed	587b056ccb	add dummy abilities to PE	2022-05-22 19:55:09 +03:00
BuffelSaft	16570e8c3f	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2022-05-22 12:55:55 +12:00
Sneed69	d0a2be9630	weather forms fixes and config	2022-05-22 03:20:48 +03:00
GriffinR	6d772a5e30	Merge pull request #1662 from GriffinRichards/door-gfx ... Clean up door animations	2022-05-21 16:07:02 -04:00
GriffinR	5c8e1e81ea	Color single-palette door anim graphics	2022-05-18 12:41:20 -04:00
GriffinR	593e2c9be0	Fix inconsistent static s/g names	2022-05-17 14:00:02 -04:00
AgustinGDLV	bd008e4c80	fixed softlocks / messages	2022-05-16 15:25:13 -07:00
ghoulslash	f6f4227f49	better bug bite impl, fix item removal	2022-05-13 16:21:41 -04:00
LOuroboros	74265efe61	Corrected size value of trainerHillTimes	2022-05-13 10:55:53 -03:00
LOuroboros	577791a6bc	Moved order of defined header files in include/global.h	2022-05-13 10:52:09 -03:00
LOuroboros	1d75f3ffde	Moved order of defined header files in include/global.h	2022-05-13 10:51:49 -03:00
LOuroboros	5397d020d7	Moved order of defined header files in include/global.h	2022-05-13 10:51:13 -03:00
LOuroboros	08225bbba9	Post Pret merge fix ... I made an oopsie.	2022-05-13 10:46:08 -03:00
BuffelSaft	bb25746e05	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2022-05-13 22:40:43 +12:00
LOuroboros	52d6c96e69	Merge branch 'master' of https://github.com/pret/pokeemerald into pePretMerge	2022-05-13 03:20:42 -03:00
LOuroboros	12d956872b	Merge branch 'master' of https://github.com/pret/pokeemerald into iePretMerge	2022-05-13 03:18:37 -03:00
LOuroboros	2263caef7a	Merge branch 'master' of https://github.com/pret/pokeemerald into battle_engine	2022-05-13 03:17:31 -03:00
sneed	bceccf5474	changes	2022-05-10 08:17:31 +03:00
sneed	709f583390	Initial commit	2022-05-10 02:58:24 +03:00
Eduardo Quezada D'Ottone	f80bab897f	Merge pull request #2112 from AgustinGDLV/evo_battle ... Gen 8 Evolution Mechanics (Battle Engine)	2022-05-09 17:40:19 -04:00
Eduardo Quezada D'Ottone	b6922a1dab	Merge branch 'pokemon_expansion' into evo_overworld	2022-05-09 16:36:34 -04:00
AgustinGDLV	9bb5db2275	removed duplicate define	2022-05-08 21:23:51 -07:00
ghoulslash	07b0ce9737	add inner focus ability popup msg	2022-05-08 17:57:30 -04:00
Eduardo Quezada D'Ottone	13f9919b9e	Merge pull request #2123 from Sneed69/wikiberry_battle ... Update Confuse Berry Hold Effect (Battle Engine)	2022-05-08 09:02:33 -04:00
Eduardo Quezada D'Ottone	c71b60d9f8	Merge branch 'PokemonExpansion' into PE_breedOverrides ... # Conflicts: # include/constants/pokemon_config.h	2022-05-07 19:45:06 -04:00
Eduardo Quezada D'Ottone	989ec641f4	Merge pull request #2120 from ghoulslash/be/healblock ... Heal Block AI and Pollen Puff Selection Prevention	2022-05-07 19:29:24 -04:00
sneed	f83875cf0f	remove item expansion check	2022-05-07 23:34:38 +03:00
AgustinGDLV	7b0154336d	Merge branch 'battle_engine' into symbiosis	2022-05-07 13:26:21 -07:00
AgustinGDLV	c7bee35161	fixed conflict with new PR	2022-05-07 13:23:41 -07:00
AgustinGDLV	9d222d3ab4	fixed gems and damage-reducing berries	2022-05-07 13:12:21 -07:00
sneed	c6b529ed50	add missing constant	2022-05-07 22:09:08 +03:00
AgustinGDLV	8a0a2a5a39	Apply suggestions from code review ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-05-07 09:36:03 -07:00
AgustinGDLV	017f44f5ac	Apply suggestions from code review ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-05-07 09:35:00 -07:00
ghoulslash	0172f84617	Merge pull request #2070 from AsparagusEduardo/PE_evoData ... Updated missing evolution and form change data	2022-05-07 11:37:11 -04:00
ghoulslash	9fa4d916d3	Merge pull request #2055 from AsparagusEduardo/BE_configs ... Once again, Battle Configs	2022-05-07 11:31:25 -04:00
Eduardo Quezada D'Ottone	dc25bc6145	Merge branch 'battle_engine' into BE_WhiteOutMoney ... # Conflicts: # include/constants/battle_string_ids.h # src/battle_message.c	2022-05-07 11:16:34 -04:00
Eduardo Quezada D'Ottone	cbe73de8c8	Merge pull request #1861 from LOuroboros/primalReversionTweaks ... Primal Reversion Tweaks	2022-05-07 11:04:23 -04:00
Eduardo Quezada D'Ottone	096fe3c11d	Removed unecessary B_LEEK_ALWAYS_CRIT config	2022-05-07 10:56:31 -04:00
Eduardo Quezada D'Ottone	4e7ce0b663	Merge branch 'battle_engine' into BE_configs ... # Conflicts: # include/constants/battle_config.h	2022-05-07 10:25:34 -04:00
ghoulslash	07579bd42b	prevent ally pollen puff selection under heal block. add some ai checks for heal block	2022-05-07 09:56:32 -04:00
ghoulslash	adfb336a3f	Merge pull request #2105 from Sneed69/healblock ... Add missing Heal Block functionalities	2022-05-07 09:13:18 -04:00
ghoulslash	e5b777695c	Merge pull request #2107 from Sneed69/steelbeam ... Steel Beam Move Effect Implementation	2022-05-07 08:40:34 -04:00
AgustinGDLV	542a0f07b4	fixed bug bite / bestow	2022-05-06 22:07:25 -07:00
BuffelSaft	57003c62fd	EFFECT_SOLAR_BEAM ... Fix definition.	2022-05-07 14:20:56 +12:00
BuffelSaft	3e1934ebe3	Rework VARIOUS_IS_PARENTAL_BOND_LAST_STRIKE ... Make this more versatile by allowing it to check parentalBondOn instead of only checking if parentalBondOn == 2. Also, fix Dragon Tail/Circle Throw switching the target on the first hit.	2022-05-07 14:20:37 +12:00
BuffelSaft	8693db632b	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2022-05-07 12:27:20 +12:00
AgustinGDLV	0cb6529ae2	functional but not perfect implementation	2022-05-06 14:53:16 -07:00
sneed	ef7cd3cdfe	BattleScript_DefiantActivates rename	2022-05-06 11:15:24 +03:00
LOuroboros	43053d2e6c	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into teleport	2022-05-06 02:22:14 -03:00
AgustinGDLV	e730d64945	corrections	2022-05-05 15:54:33 -07:00
AgustinGDLV	03c48b4f3f	compatibility with evo_battle	2022-05-05 15:46:53 -07:00
AgustinGDLV	7d42f93861	added special overworld evo changes	2022-05-05 11:55:31 -07:00
AgustinGDLV	6235970722	added special battle evo changes	2022-05-05 11:41:27 -07:00
sneed	865b771db7	initial commit	2022-05-05 00:57:19 +03:00
Eduardo Quezada D'Ottone	49905cee04	Ability Patch	2022-05-03 14:14:04 -04:00
sneed	60d7d8f97e	Initial Commit	2022-05-03 03:38:44 +03:00
sneed	b17d1f7816	Add generation specific interactions	2022-05-02 17:56:09 +03:00
sneed	23870a40a8	Initial commit	2022-05-02 06:04:16 +03:00
PikalaxALT	ff936c15e1	Sync arg descriptions from FireRed ... https://github.com/pret/pokefirered/pull/501	2022-04-28 13:46:23 -04:00
Eduardo Quezada D'Ottone	cb9cace04f	Merge remote-tracking branch 'RHH/pokemon_expansion' into PE_KadabraEverstone ... # Conflicts: # include/constants/pokemon_config.h	2022-04-27 12:05:33 -04:00
ghoulslash	7bc50392d0	Merge pull request #2072 from AsparagusEduardo/PE_ShellBlastEverstone ... Fixed Shelmet and Karrablast being able to evolve if the partner is holding an Everstone	2022-04-27 08:51:37 -04:00
ghoulslash	166b16d22c	Merge pull request #2091 from AsparagusEduardo/PE_LegendaryIV ... Config for Legendaries, Mythicals and Ultra Beasts to have at least 3 perfect IVs	2022-04-27 08:48:22 -04:00
ghoulslash	574be40f26	Merge pull request #2099 from Greenphx9/calyrex_rider_icons ... Calyrex Rider Icons	2022-04-27 08:43:53 -04:00
BuffelSaft	746d9ea6c5	Add AI_GetBattlerMoveTargetType() ... Add AI version of the function that handles move target selection, as it needs to have ability and item info that it may not have access to.	2022-04-27 22:23:20 +12:00
BuffelSaft	af6242f2e0	Requested changes, Sticky Web edge case ... Fix issues found by ghoulslash, and make sure Defiant works properly with Sticky Web and Court Change.	2022-04-27 21:51:10 +12:00
BuffelSaft	5358cc0a00	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2	2022-04-25 13:38:13 +12:00
Greenphx9	b3294c60a2	Calyrex Rider Icons	2022-04-22 16:31:17 +10:00
GriffinR	fc5747f0f7	Merge pull request #1649 from GriffinRichards/clean-trainer ... Trainer hill clean up	2022-04-20 00:20:44 -04:00
TheXaman	c54bf21b01	Merge branch 'master' of https://github.com/pret/pokeemerald into tx_debug_system	2022-04-16 23:18:35 +02:00
Eduardo Quezada D'Ottone	a6175d2622	Config for Legendaries, Mythicals and Ultra Beasts to have at least 3 perfect IVs	2022-04-16 13:01:15 -04:00
Eduardo Quezada D'Ottone	84d713a50f	Legendary and Mythical flags	2022-04-14 18:44:20 -04:00
TheXaman	2fa812df26	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into rhh_master_merge	2022-04-13 20:51:35 +02:00
LOuroboros	446bcd3181	Merge branch 'master' of https://github.com/pret/pokeemerald into pePret	2022-04-11 01:23:18 -03:00
LOuroboros	eb1834ce84	Merge branch 'master' of https://github.com/pret/pokeemerald into iePret	2022-04-11 01:22:48 -03:00
LOuroboros	b6e2945072	Merge branch 'master' of https://github.com/pret/pokeemerald into bePret	2022-04-11 01:22:10 -03:00
LOuroboros	3ca9ac5b37	Post merge corrections	2022-04-03 14:27:33 -03:00
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
GriffinR	a7e6045d71	Merge pull request #1597 from GriffinRichards/misc-cleanup ... Miscellaneous fixes	2022-01-19 22:17:37 -05:00
GriffinR	c4f33f2b2b	TRAVERSABLE->UNUSED, rename MB_SECRET_BASE_OBSTACLE	2022-01-19 12:54:55 -05:00
GriffinR	e682c12519	sTileBitAttributes to sparse array, rename MB_UNNUSED_CAVE	2022-01-19 12:39:11 -05:00
GriffinR	8200fda14e	Fix decorations metatile attribute names	2022-01-19 10:56:54 -05:00
GriffinR	a8b466dc80	Disambiguate fieldmap names	2022-01-19 10:15:32 -05:00
GriffinR	f127e64a3c	Name overworld tilemaps for their bg, add layer type constants	2022-01-19 09:37:12 -05:00
GriffinR	225147a94f	Document Spinda spot algorithm	2022-01-17 15:34:18 -05:00
Eduardo Quezada D'Ottone	925f65c450	Realigned config to previous state	2022-01-16 21:10:09 -03: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
LOuroboros	a4d31da923	Updated the value of MAX_MAP_DATA_SIZE	2022-01-16 19:22:28 -03:00
Eduardo Quezada D'Ottone	02da6cc627	Merge remote-tracking branch 'RHH/item_expansion' into IE_noJadeOrb ... # Conflicts: # include/graphics.h # src/data/graphics/items.h # src/data/item_icon_table.h # src/data/items.h # src/data/text/item_descriptions.h	2022-01-16 18:44:03 -03:00
Eduardo Quezada D'Ottone	d40119010e	Merge branch 'BattleEngine' into BE_wildNaturalEnemies ... # Conflicts: # include/constants/battle_config.h	2022-01-16 16:23:12 -03:00
Eduardo Quezada D'Ottone	6aabe58649	Merge branch 'battle_engine' into magician	2022-01-15 13:06:13 -03:00
Eduardo Quezada D'Ottone	b86694876c	Merge pull request #1508 from Scott-Bonner/get_ability ... Handle GetAbilityBySpecies edge cases	2022-01-15 12:56:50 -03:00
ghoulslash	a0aaad2856	Merge pull request #2016 from AsparagusEduardo/PE_genderDiff ... Optimized SpeciesHasGenderDifference into Base Stat flag	2022-01-13 11:55:29 -05:00
ghoulslash	46c2a9ada5	Merge pull request #2033 from LOuroboros/galarianZenMode ... Allow Galarian Darmanitan's Zen Mode to work	2022-01-13 11:42:54 -05:00
ghoulslash	543252bc6c	Merge pull request #2034 from LOuroboros/proteanMsgboxFlush ... Tweaked Protean's effect's InGame appearance	2022-01-13 11:42:31 -05:00
ghoulslash	035b2332af	cache ai damage, effectiveness calcs	2022-01-13 11:28:27 -05:00
LOuroboros	a4f0de5106	Removed the last bits of HOLD_EFFECT_GRACIDEA	2022-01-12 01:54:29 -03:00
LOuroboros	b2965e5522	Added a pause to BattleScript_ProteanActivates	2022-01-11 20:15:47 -03:00
GriffinR	694aa3c65d	Move balls, shop, link, map popups, and bag out of interface	2022-01-11 13:53:23 -05:00
GriffinR	7103839a61	Move summary screen graphics out of interface, fix some names	2022-01-11 11:22:45 -05:00
GriffinR	fde18b4774	Fix berry crusher graphics name	2022-01-11 10:42:00 -05:00
GriffinR	0a78cb5c9e	Fix some battle dome graphics names	2022-01-11 10:04:47 -05:00
LOuroboros	24b5a5709a	Allow Galarian Darmanitan's Zen Mode to work	2022-01-10 23:01:18 -03:00
GriffinR	4024b3f1b3	Merge pull request #1590 from GriffinRichards/dex-enum ... Convert pokedex defines to enums	2022-01-10 14:56:26 -05:00
GriffinR	8b920691e6	Fix FLAG_DECORATION_0 name	2022-01-09 01:31:42 -05:00
LOuroboros	5281fe63fc	Update NUM_TECHNICAL_MACHINES	2022-01-08 21:27:29 -03: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	577e6cc740	Merge pull request #1586 from GriffinRichards/clean-areascreen ... Clean up pokedex_area_screen	2022-01-06 23:02:23 -05:00
GriffinR	5d033c2e4d	Convert pokedex defines to enums	2022-01-05 12:18:49 -05:00
GriffinR	ce55e58ad8	Misc cleanup	2022-01-04 10:09:42 -05:00
TheXaman	44a6c4c0ec	changed EGG_MOVES_ARRAY_COUN to 19 to include all the added egg moves (19 is max value (Buneary))	2022-01-04 00:23:24 +01:00
Eduardo Quezada D'Ottone	4f9e6faa48	Merge branch 'item_expansion' into flingIE	2022-01-02 18:31:03 -03:00
Eduardo Quezada D'Ottone	221e38ff86	Merge pull request #1957 from ghoulslash/be/ability_popup ... Ability Popup Fixes + Longer Ability Names config	2022-01-01 19:39:55 -03:00
Eduardo Quezada D'Ottone	3bbaf5a15d	Optimized SpeciesHasGenderDifference into Base Stat flag	2022-01-01 19:24:34 -03:00
LOuroboros	74aa4f29df	Corrections and additions ... -Fixed a handful of prices -Re-added the Todo comment to the entries of the TMs 51-100 in gItemIconTable. -Added the data and sprites of the LGPE Lures, thanks to AsparagusEduardo. -Fixed small syntax mistakes in src/data/text/item_descriptions.h -Slightly changed some item descriptions based on AsparagusEduardo's suggestions. -Fixed the Exp. Charm's description, and the usage of "Exp." in the Exp. Candies' descriptions.	2022-01-01 17:17:21 -03:00
Eduardo Quezada D'Ottone	b25c89f8a1	Removed Redundant Key Stone item	2021-12-31 18:22:23 -03:00
LOuroboros	9b1fd796ae	Gave the Gracidea's old hold effect slot to the Enigma Berry	2021-12-31 18:07:33 -03:00
Eduardo Quezada D'Ottone	313df31e7e	Removed Jade Orb, since it has no use besides being a key-lock item.	2021-12-31 17:44:03 -03:00
LOuroboros	0c5652596b	Removed HOLD_EFFECT_GRACIDEA	2021-12-31 17:34:16 -03:00
LOuroboros	5a8e51d858	Filled in missing items' sprite data	2021-12-31 16:27:06 -03: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
GriffinR	aadab8b016	Move pokemon and easy chat constants to global, misc clean-up	2021-12-28 18:07:41 -05:00
LOuroboros	ce7815ebcc	Update pokemon.h	2021-12-28 15:11:52 -03:00
LOuroboros	677da7b5e7	Fixed struct names	2021-12-28 14:48:57 -03:00
Eduardo Quezada D'Ottone	e405bd8ad3	Merge pull request #2005 from LOuroboros/evoMoves ... Implemented evolution moves	2021-12-26 17:24:37 -03:00
Eduardo Quezada D'Ottone	7bffe6d1d5	Merge pull request #2004 from ghoulslash/be/sports ... Add sport effects back	2021-12-24 18:59:50 -03:00
ghoulslash	93a7e139ec	merge w be	2021-12-24 09:40:12 -05:00
Eduardo Quezada D'Ottone	2ebe427a42	Merge branch 'BattleEngine' into BE_wildNaturalEnemies ... # Conflicts: # src/battle_controller_opponent.c	2021-12-23 21:19:59 -03:00
ghoulslash	770224d341	increase TEXT_BUFF_ARRAY_COUNT for expanded ability names	2021-12-23 18:58:15 -05:00
WiserVisor	8923ffb3af	Merge branch 'battle_engine' into battle_engine	2021-12-23 15:29:10 -08:00
Eduardo Quezada D'Ottone	934ffd5a7e	Merge pull request #2002 from LOuroboros/gen78footprints ... Added the footprints of all Gen. 7 and 8 species	2021-12-23 20:28:55 -03:00
Eduardo Quezada D'Ottone	67697d2de3	Merge pull request #1582 from ghoulslash/smart_wild_ai ... Smart Wild AI Option	2021-12-23 20:18:18 -03:00
ghoulslash	0a95a31ee9	fix formatting	2021-12-23 08:44:54 -05:00
LOuroboros	713d97891f	Update include/constants/battle_config.h ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2021-12-22 21:32:10 -03:00
LOuroboros	d6a78f386f	Implemented evolution moves ... Thanks to UltimaSoul and Sagiri/Zeturic	2021-12-22 18:02:23 -03:00
ghoulslash	2736223b1b	Merge pull request #1698 from AsparagusEduardo/PE_FormChangeHoldItems ... Form changing by holding items	2021-12-21 09:10:23 -05:00
ghoulslash	b4cc5e3cd8	Merge pull request #1952 from AsparagusEduardo/PE_natureEvo ... Added Nature evolution methods	2021-12-20 14:08:47 -05:00
ghoulslash	05f91bc243	Update include/constants/battle_config.h ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2021-12-20 14:06:32 -05:00
ghoulslash	02fe96cc08	fix config settings	2021-12-20 13:06:23 -05:00
LOuroboros	cb44de13b3	B_NEW_MULTI_BATTLE_DEFEAT_CONDITION -> B_MULTI_BATTLE_WHITEOUT	2021-12-19 20:53:57 -03:00
Eduardo Quezada D'Ottone	4ab4250d5d	Merge branch 'battle_engine' into be/sports	2021-12-19 20:42:15 -03:00
Eduardo Quezada D'Ottone	a57043b589	Merge pull request #1983 from sphericalice/last_ball_refactor ... Refactor CanThrowLastUsedBall and related functions	2021-12-19 20:21:50 -03:00
Eduardo Quezada D'Ottone	6d17156f74	Merge pull request #1934 from BuffelSaft/fix-burmy ... Fix Burmy form change	2021-12-19 20:18:19 -03:00
Eduardo Quezada D'Ottone	8b49f8f925	Merge branch 'pokemon_expansion' into PE_FormChangeHoldItems	2021-12-19 12:08:52 -03:00
LOuroboros	ffe35fbb06	Updated defeat condition on multi battles	2021-12-19 08:30:43 -03:00
Blackforest92	76b9459e42	fix .8bpp palette + revert hippo icons	2021-12-19 17:38:01 +07:00
Eduardo Quezada D'Ottone	39ef356be1	Merge pull request #1935 from LOuroboros/someGenderDiffs ... Added gender differences for a couple of Gen. 4 Pokémon	2021-12-18 13:46:23 -03:00
Eduardo Quezada D'Ottone	a075cca448	Merge branch 'battle_engine' into fix-burmy	2021-12-18 13:38:12 -03:00
ultima-soul	18afd06f6d	Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-12-18 00:28:18 -08:00
ultima-soul	b0b8b9bf46	Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-12-17 23:51:29 -08:00
ultima-soul	4f2e3bf214	Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-12-17 21:23:54 -08: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
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	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
TheXaman	fe95e88938	added option to view changes for front/back sprite picCoords and elevation live	2021-12-13 22:31:37 +01:00
TheXaman	f1f4082f62	added footprints	2021-12-13 19:24:19 +01:00
TheXaman	d113d5efd9	Update include/battle_bg.h ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2021-12-13 18:56:50 +01:00
LOuroboros	46977b52fa	Added the footprints of all Gen. 7 and 8 species	2021-12-13 13:39:12 -03:00
TheXaman	123969f093	fixed front sprite position including elevation and shadow for flying mon's (shadow palette too dark atm)	2021-12-13 15:05:17 +01:00
Eduardo Quezada D'Ottone	7ca07527fa	Config for HP bars moving faster for higher HP amounts. Credit to Dat.H	2021-12-12 12:33:49 -03:00
Eduardo Quezada D'Ottone	bbf7b62ceb	Config for lost money after losing a battle	2021-12-11 23:03:50 -03:00
LOuroboros	f317b542e2	Updated Teleport	2021-12-11 21:20:04 -03:00
TheXaman	51371661c2	Added new menu naviagtion, now all options can be changed	2021-12-11 15:03:56 +01:00
TheXaman	bbe918941e	added include/constants/pokemon_debug,h for defines, restructured code order	2021-12-11 12:13:14 +01: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
TheXaman	f6d9b74a1a	Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into pokemon_expansion_debug	2021-12-10 16:48:46 +01:00
Eduardo Quezada D'Ottone	aa2b2e6a70	Merge pull request #1929 from ultima-soul/battle_engine_sync ... Battle Engine Upstream Sync	2021-12-09 20:02:45 -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
ultima-soul	d99ac2e44a	Resolved review suggestions for upstream Pokemon Expansion sync.	2021-12-09 09:51:28 -08:00
ultima-soul	a5afdac0ae	Resolved review suggestions for upstream Battle Engine sync.	2021-12-08 12:08:16 -08:00
Blackforest92	a7c9e6e230	Reverse both Hippopotas and Hippowdon icons to use male only	2021-12-09 00:24:31 +07:00
Blackforest92	55477234ef	Palette conversion GEN5	2021-12-08 21:39:31 +07:00
DizzyEggg	97539d7443	Merge pull request #1951 from ghoulslash/be/sheercold ... Ice Types immune to Sheer Cold	2021-12-06 14:12:06 +01:00
sphericalice	5c02facde4	Use more specific enum names for throwable Balls	2021-12-05 23:17:44 +00:00
sphericalice	3db871c49a	Refactor CanThrowLastUsedBall and related functions	2021-12-05 23:10:05 +00:00
ghoulslash	c0e408bfab	fix aqua ring heal anim	2021-12-05 14:44:22 -05:00
Eduardo Quezada D'Ottone	1708ac4b1b	Wild mon that have a natural enemy or preys on other mon will attack them whem partnered in double wild battles.	2021-12-04 22:13:29 -03:00
SonikkuA-DatH	b6fff16a7d	Update battle.h	2021-12-03 18:04:44 -08:00
ultima-soul	349262ebc3	Merge remote-tracking branch 'rhh/item_expansion' into item_expansion_sync	2021-12-03 17:31:02 -08: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
Eduardo Quezada D'Ottone	96b8d21b7a	Added form switching + Button icons	2021-12-03 19:32:31 -03:00
TheXaman	40f7247e11	changed P_ENABLE_DEBUG to TRUE/FALSE	2021-12-03 11:02:22 +01:00
TheXaman	bf0d2b8393	Changed definition of P_ENABLE_DEBUG to pokemon_config.h	2021-12-02 19:29:04 +01:00
ultima-soul	d408b56549	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-12-01 20:18:57 -08:00
ultima-soul	a68a39e35f	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-12-01 20:17:49 -08:00
ultima-soul	23bf41713c	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-12-01 20:17:08 -08:00
LOuroboros	2e67153982	Renamed the Enigma Berries' constants	2021-12-01 22:16:38 -03:00
LOuroboros	e7bef25fb1	Updated hold_effects.h	2021-12-01 13:32:43 -03:00
Blackforest92	2ad3c3f6be	Palette Conversion GEN4	2021-12-01 19:57:50 +07:00
LOuroboros	19af517bbb	Edited pointless or useless Primal Reversion code ... Also added an equivalent to GetMegaEvolutionSpecies and GetWishMegaEvolutionSpecies for Primal Reversion. Also also modified how CanBattlerGetOrLoseItem checks for Primal Reversion. Also also also rewrote the check that triggers Primal Reversion in TryDoEventsBeforeFirstTurn.	2021-12-01 00:56:33 -03:00
LOuroboros	f2dd7bce99	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionTweaks	2021-11-30 20:39:58 -03:00
TheXaman	c402a840b1	changed to P_ENABLE_DEBUG	2021-11-30 11:20:26 +01:00
TheXaman	50e95878e9	added Select button text, added gender based icons, imrpoved code	2021-11-30 11:16:30 +01:00
TheXaman	b0f8408fb6	added gender based sprites, added textbox line, adjusted sprite offset to match line	2021-11-30 02:29:33 +01:00
TheXaman	6c520659aa	implemented a inital pokemon debug menu based on code from Gamer2020 and AsparagusEduardo	2021-11-29 22:52:08 +01:00
ghoulslash	7a7c6afc39	larger ability popup, fix ability name printing/clearing, and config for longer ability names	2021-11-29 12:42:01 -05:00
SonikkuA-DatH	7b5dfa83af	Update battle_move_effects.h	2021-11-28 19:44:02 -08:00
SonikkuA-DatH	002556cf3f	Update battle_script_commands.h	2021-11-28 19:42:32 -08:00
SonikkuA-DatH	ca4207d497	Update battle_anim.h	2021-11-28 19:40:55 -08:00
SonikkuA-DatH	c8fba3fa90	Update graphics.h	2021-11-28 19:36:17 -08:00
TheXaman	5780560007	fixed some bugs, thanks to cbt	2021-11-28 20:28:54 +01:00
ghoulslash	d108f77aa4	revert ai item usage code	2021-11-28 13:12:56 -05:00
ultima-soul	01a90ca6c2	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-11-27 22:17:05 -08:00
ultima-soul	d0623d7b71	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-11-27 21:40: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
Eduardo Quezada D'Ottone	fa995894b7	Added Nature evolution methods	2021-11-27 20:46:19 -03:00
Eduardo Quezada D'Ottone	7c6f76323a	Added NidoranM/Volbeat Ditto breeding config + Rotom & Furfrou	2021-11-26 22:56:48 -03:00
ghoulslash	e2af9ec3b4	ice type immunity to sheer cold	2021-11-26 11:49:49 -05:00
ghoulslash	5c52abd856	gen3 sport move functionality behind config	2021-11-23 21:20:32 -05:00
ghoulslash	e3ddad2d11	add sport effects back	2021-11-23 18:36:10 -05:00
BuffelSaft	cca7ec8c58	Fix and rename GetMoveTargetType ... Change name to GetBattlerMoveTargetType and make it actually use the battlerId argument.	2021-11-24 12:09:54 +13:00
kleeenexfeu	9b25e0147c	Update include/constants/battle_config.h ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2021-11-23 14:35:37 +01:00
kleeenexfeu	f2755ad970	reword B_RECALC_TURN_AFTER_ACTIONS explanation	2021-11-23 14:28:52 +01:00
kleeenexfeu	84e6e083f7	hate the explanations about turn order ._. ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2021-11-23 14:24:30 +01:00
kleeenexfeu	6ceffaaf3e	recalculate turn order after relevant actions	2021-11-23 13:46:36 +01:00
kleeenexfeu	1a5d3191e2	battle_engine merge	2021-11-23 13:38:36 +01:00
BuffelSaft	a89ce0c38a	Swapped webs don't trigger Defiant ... Track the side that originally set Sticky Web, and if it matches the side the target of the speed drop is on, don't activate Defiant. Hard to tell if this is a bug or a feature in gen 8 - maybe the swapped webs are considered a "friendly" effect? Also, fix Sticky Web not activating Defiant.	2021-11-23 22:54:30 +13:00
BuffelSaft	499fb8071d	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2	2021-11-23 17:12:24 +13:00
BuffelSaft	fa0b5188bb	Dynamic move targeting ... Properly implement Expanding Force by replacing all instances that read move target from gBattleMoves with a function.	2021-11-23 16:56:11 +13:00
BuffelSaft	6b8f86c276	Snap Trap placeholder anims ... Set up animation data for Snap Trap so it can be easily replaced with a proper animation later.	2021-11-23 11:05:36 +13:00
BuffelSaft	ff60882b29	Requested changes	2021-11-23 11:04:39 +13:00
Jaizu	b7f4658077	Added Kricketot line gender difference sprites	2021-11-22 16:30:05 -03:00
LOuroboros	8373312ed7	Add gender differences for some Gen. 4 Pokémon ... Namely: Bidoof, Kricketot, Shinx, Starly, Staravia and Staraptor Credits to CyanSMP64/Furret and Jaizu.	2021-11-22 16:25:25 -03:00
BuffelSaft	62f01e89d7	Fix Burmy form change ... Wasn't properly tracking if Burmy had appeared in battle; gSentPokesToOpponent is used only for exp calculation and is cleared when an opponent faints, so a new var was needed.	2021-11-23 00:46:43 +13:00
BuffelSaft	50d0cd52e8	Clean up Corrosive Gas ... Remove code and unused move effect.	2021-11-22 15:13:54 +13:00
BuffelSaft	d2eb5f0e61	Remove shell trap effect code ... Left strings and animations as those were fine, but code was non-functional and fixing it was not trivial.	2021-11-22 14:46:47 +13:00
BuffelSaft	42b8f18cb1	Remove Corrosive Gas code ... This was not working at all in testing, so it can be done by a separate PR later.	2021-11-22 14:35:01 +13:00
BuffelSaft	70f0018c08	Partially implement Shell Trap ... Doesn't play the animation when the trap triggers, but kinda works? May also be incredibly buggy, but I'm not interested in working on this move any further.	2021-11-22 14:14:41 +13:00
ultima-soul	a8f9a54787	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-11-21 10:41:32 -08:00
ultima-soul	57bf1c7824	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-11-21 10:41:12 -08:00
ultima-soul	3ed51d6d91	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-11-21 10:40:26 -08:00
Eduardo Quezada D'Ottone	dee7f97a8d	Merge branch 'battle_engine' into battle_ai	2021-11-21 14:46:09 -03:00
Eduardo Quezada D'Ottone	30a4ef3723	Merge pull request #1924 from ghoulslash/be/wish ... Fix wish	2021-11-21 14:04:06 -03:00
ghoulslash	3404039330	Merge pull request #1918 from kleeenexfeu/be_mega_evo_alter_turn ... Mega Evolution alters turn order	2021-11-21 08:12:21 -05:00
BuffelSaft	bcaa17ffb3	Finish/tidy up Court Change ... Use a macro to simplify timer and status updates, and swap things like reflectBattlerId to the opposing side - this is required for the effects to be properly swapped.	2021-11-21 17:20:45 +13:00
Eduardo Quezada D'Ottone	31d7719429	Merge pull request #1913 from LOuroboros/healingItems ... Changed I_LEGACY_HEALING_ITEMS	2021-11-20 23:37:24 -03:00
ghoulslash	3fb62f74c6	fix rampage cancelling	2021-11-20 18:35:56 -05:00
ghoulslash	37ab20e29c	fix wish	2021-11-20 16:49:04 -05:00
W1serV1ser	c2f81cd5f5	Added Sky Drop	2021-11-20 11:44:48 -08:00
kleeenexfeu	6402a7ab6e	follow suggestion ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2021-11-19 23:42:20 +01:00
kleeenexfeu	acddeeb1f9	follow suggestion ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2021-11-19 23:30:33 +01:00
LOuroboros	ad8582064b	#elif without condition bad, #else good	2021-11-19 18:49:30 -03:00
kleeenexfeu	03a9f3f413	Mega Evolution alters turn order	2021-11-19 22:03:10 +01:00
Eduardo Quezada D'Ottone	1696e60b9f	Merge pull request #1876 from ghoulslash/be/ai_updates ... Some more CanAIFaintTarget checks and other AI updates	2021-11-19 17:33:21 -03:00
BuffelSaft	14a2e86313	Fix Scale Shot ... Lowers defense and raises speed instead of just lowering defense now. Tested with Contrary and min/max speed/def.	2021-11-19 21:57:32 +13:00
BuffelSaft	98712e576e	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2	2021-11-19 17:48:11 +13:00
BuffelSaft	16a4fc9062	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-11-19 16:33:24 +13:00
TheXaman	2f8896f2f0	Merge branch 'master' of https://github.com/pret/pokeemerald into tx_debug_system	2021-11-18 15:13:04 +01:00
TheXaman	5104293344	Changed to TX_DEBUGGING define instead of makefile DEBUGGING option	2021-11-18 15:09:06 +01:00
GriffinR	c89dfd9f56	Finish updating macro comments	2021-11-18 01:47:58 -05:00
GriffinR	b5b5d95de6	Distinguish 'virtual object' names from object events	2021-11-17 23:40:53 -05:00
GriffinR	b9fa18bdd4	Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into update-macros	2021-11-17 22:03:37 -05:00
GriffinR	c940b67716	Continue macro comment updating	2021-11-17 17:45:59 -05:00
GriffinR	c1970a4bc8	Remove dead sub references	2021-11-17 15:47:47 -05:00
GriffinR	ecb13cdbf7	Merge pull request #1550 from GriffinRichards/doc-pokenav ... Document Pokénav	2021-11-17 14:47:34 -05:00
GriffinR	eb95ac0b9c	Document field_tasks	2021-11-17 14:44:42 -05:00
LOuroboros	7ae30f8913	I_LEGACY_HEALING_ITEMS -> I_HEALTH_RECOVERY ... Also fixed its inaccurate description.	2021-11-17 07:15:14 -03:00
LOuroboros	7d71fe6ce8	I_NEW_VITAMIN_EV_CAP -> I_VITAMIN_EV_CAP	2021-11-16 21:25:03 -03:00
GriffinR	61aa9c3ba9	More updating event macro comments	2021-11-16 17:46:34 -05:00
LOuroboros	f62ec0630a	Updated Vitamins cap	2021-11-16 18:36:49 -03:00
GriffinR	d414787932	Some TV clean-up	2021-11-16 16:22:17 -05:00
GriffinR	5d9c31a610	Label slot machine ids, fix GetPriceReduction	2021-11-16 15:43:52 -05:00
GriffinR	63c5905914	Continue updating event macro comments	2021-11-16 13:10:23 -05:00
GriffinR	04cc923d6c	Handle optional arguments for warp commands, add WARP_ID_NONE	2021-11-16 10:53:00 -05:00
Eduardo Quezada D'Ottone	cc833ebb59	Created macro + config for always critting when using high-crit moves	2021-11-15 23:21:46 -03:00
Eduardo Quezada D'Ottone	a1bd6bd52f	Updated species that benefit from Leek	2021-11-15 22:30:20 -03:00
LOuroboros	5c485d9769	Fixed Fling when gLastUsedItem is 0 ... Also renamed VARIOUS_JUMP_IF_NO_FLING_POWER to VARIOUS_JUMP_IF_FLING_FAILS.	2021-11-15 14:02:33 -03:00
GriffinR	c1130592fa	Drop some overworld prefixes	2021-11-15 10:58:05 -05:00
GriffinR	65d3b58374	Add PARTY_NOTHING_CHOSEN	2021-11-15 10:57:06 -05:00
LOuroboros	de74177966	Oops	2021-11-15 12:52:05 -03:00
LOuroboros	a01fd2eb7a	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE	2021-11-15 12:47:26 -03:00
ghoulslash	2a1299715f	merge w be	2021-11-15 10:45:59 -05:00
LOuroboros	ea12dfdf2c	Implemented Fling	2021-11-15 12:41:00 -03:00
LOuroboros	cbb6639f8d	Fling tweaks ... -Updated and renamed VARIOUS_JUMP_IF_FLING_FAILS (now VARIOUS_JUMP_IF_NO_FLING_POWER) -Updated BattleScript_EffectFling following Smogon's description of Fling's effect. -Refactored BattleScript_FlingMentalHerb thanks to GetMentalHerbEffect -No need to define flingPower when its value is 0 -Forced the target to eat a berry that was flung at them by overwriting their item with the berry thrown and restoring their original item after its effect finishes. -Added a preproc config for Klutz.	2021-11-15 12:40:10 -03:00
ghoulslash	0e397c43fe	Merge pull request #1898 from AsparagusEduardo/BE_postIETweaks ... Adjusted elements to simplify the conflicts between BE and IE	2021-11-15 08:27:28 -05:00
GriffinR	4275cf4b90	Rename pokenav match call files	2021-11-15 01:30:21 -05:00
GriffinR	14d78d7633	Finish match call menu doc	2021-11-15 01:20:03 -05:00
GriffinR	c779d03b3e	Rename pokenav_match_call_ui	2021-11-15 00:21:40 -05:00
GriffinR	d4d4234283	Finish pokenav list ui doc	2021-11-15 00:09:02 -05:00
Wiz	927f9d27df	Designate gBattleAnimBgImage_Attract and related as arrays	2021-11-14 17:08:03 -05:00
ghoulslash	8b296b97a8	Merge pull request #1887 from BuffelSaft/knock-off ... Fix Knock Off, add config	2021-11-14 08:27:51 -05:00
GriffinR	f42eafc85b	Merge branch 'master' into doc-banim	2021-11-13 23:26:46 -05:00
GriffinR	159bb37bbe	Merge branch 'master' into fix_saveblock_reorder	2021-11-13 23:19:57 -05:00
GriffinR	9a932cd9c3	Merge pull request #1549 from GriffinRichards/doc-binterface ... Document remaining symbols in battle_interface, palette, and save	2021-11-13 23:19:08 -05:00
ProjectRevoTPP	9d3345a6d6	Enforce structs to enforce save block order for modern toolchains.	2021-11-13 21:41:16 -05:00
GriffinR	b14fe9dce3	Merge pull request #1547 from GriffinRichards/doc-sounddata ... Clean up sound, add CRY_MODE constants	2021-11-13 15:54:40 -05:00
GriffinR	b3e593dff5	Continue pokenav list ui doc	2021-11-13 15:52:58 -05:00
GriffinR	ec05157568	Move pokenav list item union out of list struct	2021-11-13 11:27:11 -05:00
Eduardo Quezada D'Ottone	bcbdb353f5	Adjusted elements to simplify the conflicts between BE and IE	2021-11-13 12:10:20 -03:00
Eduardo Quezada D'Ottone	67f12ef782	Fixed Hold Effect file spacing	2021-11-13 11:56:17 -03:00
ghoulslash	940a165be7	merge w be	2021-11-13 09:09:15 -05:00
Eduardo Quezada D'Ottone	8f52996144	Merge pull request #1892 from ghoulslash/be/wish ... wish update	2021-11-13 11:01:04 -03:00
ghoulslash	9df66f4ac1	Merge pull request #1843 from Blackforest92/battle_engine ... Update Giga Impact's graphic and use fade-in battle animation.	2021-11-13 08:54:37 -05:00
ghoulslash	a4204e5491	Update include/constants/battle_config.h ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2021-11-13 08:50:24 -05:00
LOuroboros	2fe015e5ce	Implemented Fling	2021-11-13 10:27:05 -03:00
Eduardo Quezada D'Ottone	bcb0f1b915	Merge pull request #1890 from kleeenexfeu/battle_engine ... Bypassing screens and protections correctly	2021-11-13 10:11:02 -03:00
kleeenexfeu	f808710932	Moving IsBattlerProtected	2021-11-13 13:38:07 +01:00
BuffelSaft	04867ac0d3	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-11-13 17:33:25 +13:00
BuffelSaft	55b279ba0a	Fix several move effects ... Dragon Tail, Natural Gift, Spit Up all hit twice now. Could maybe use isparentalbondlaststrike instead of some of the other checks too.	2021-11-13 16:29:12 +13:00
GriffinR	3b91d8fdaf	Start pokenav list ui doc	2021-11-12 20:36:19 -05:00
GriffinR	da5752fd0d	Start match call menu doc	2021-11-12 20:17:06 -05:00
BuffelSaft	6232b046b1	Fix Burn Up ... Now works properly with and without Parental Bond. It wasn't broken before, but its interaction with Parental Bond was.	2021-11-13 12:40:45 +13:00
ghoulslash	c4efe06f38	wish update	2021-11-12 17:55:05 -05:00
Eduardo Quezada D'Ottone	a7870dbef0	Merge branch 'battle_engine' into magician	2021-11-12 19:40:34 -03:00
GriffinR	ffe2970e30	Rename pokenav menu handler files	2021-11-12 17:13:50 -05:00
GriffinR	baeacbe2f1	Clean up pokenav general menus, organize pokenav graphics	2021-11-12 17:08:12 -05:00
ghoulslash	96fd8e696b	brick break gen 4 and 5 config. clears aurora veil	2021-11-12 15:00:21 -05:00
ultima-soul	294fecd57c	Merge pull request #1888 from ghoulslash/be/contrary ... Fix Contrary Animation	2021-11-12 10:19:37 -08:00
Eduardo Quezada D'Ottone	34555b46e8	Oops	2021-11-12 14:47:35 -03:00
ghoulslash	a26da51e9d	fix contrary animations for MOVE_EFFECT_statchange	2021-11-12 12:44:45 -05:00
ultima-soul	c5dabf34b8	Improve Serene Grace boost config comment.	2021-11-12 09:39:18 -08:00
GriffinR	004d1cab3f	Clean up pokenav conditions doc	2021-11-12 11:13:49 -05:00
GriffinR	35aeff1b6d	Rename pokenav conditions files	2021-11-12 11:07:52 -05:00
GriffinR	f5152094a9	Finish pokenav conditions doc	2021-11-12 11:01:22 -05:00
ghoulslash	201a38f487	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into be/ai_updates	2021-11-12 08:13:21 -05:00
ghoulslash	6214d8b625	rename config	2021-11-12 07:47:24 -05:00
BuffelSaft	bdbdd0564f	Fix Knock Off, add config ... Added a config for Knock Off's damage boost. Also fixed the conditions it checks to do bonus damage.	2021-11-12 21:05:42 +13:00
Eduardo Quezada D'Ottone	ae26a7529c	Restored FRLG items	2021-11-11 22:26:58 -03:00
ghoulslash	adc1413d98	add kings rock serene grace boost config	2021-11-11 17:48:15 -05:00
ghoulslash	2fac38cc83	merge w be	2021-11-11 16:16:26 -05:00
GriffinR	7efdc0902b	Finish condition graph doc	2021-11-11 15:29:15 -05:00
ultima-soul	fd4d0db912	Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into ball_effects	2021-11-10 18:02:00 -08:00
GriffinR	4590887359	Clean up some register constant use	2021-11-10 17:01:21 -05:00
GriffinR	343ac99049	Start pokenav conditions doc	2021-11-10 17:00:54 -05:00
GriffinR	342b7da5d3	Fix CRY_MODE_ECHO	2021-11-10 11:59:15 -05:00
ultima-soul	c74e19c062	Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp	2021-11-09 20:58:19 -08:00
GriffinR	ef935f6f4a	Merge pull request #1544 from GriffinRichards/romheadergf ... Split headers from crt0.s	2021-11-09 23:54:57 -05:00
ultima-soul	69e3719f75	Add back TM Case, Bicycle, and Vs. Seeker. Add Poké Radar.	2021-11-09 19:19:48 -08:00
BuffelSaft	e2599c2469	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1	2021-11-10 14:31:32 +13:00
GriffinR	8e424b6985	Merge branch 'master' into doc-binterface	2021-11-09 16:09:48 -05:00
GriffinR	43e942c3af	Clean up pokenav ribbons	2021-11-09 12:50:35 -05:00
ghoulslash	e635930a15	fixes	2021-11-08 21:33:00 -05:00
GriffinR	1c82571fa0	Merge pull request #1542 from GriffinRichards/doc-menu ... Document menu	2021-11-08 21:23:21 -05:00
GriffinR	adf773f1ed	Document remainder of save.c	2021-11-08 19:45:14 -05:00
GriffinR	ab1074e629	Label unknown palette functions	2021-11-08 16:08:36 -05:00
GriffinR	684f599a44	Label remaining battle_interface symbols	2021-11-08 16:03:44 -05:00
GriffinR	e3b6337c3a	Finish battle_anim_mons doc	2021-11-08 14:29:37 -05:00
ghoulslash	01cf8e6452	add AI_MoveMakesContact, dissuade multi-hit attacks against rocky helmet	2021-11-08 11:55:06 -05:00
GriffinR	d20341646a	Start battle_anim_mons doc	2021-11-08 11:46:13 -05:00
ghoulslash	8f320a8d33	some ai updates, recycle + ripen logic	2021-11-08 11:37:41 -05:00
GriffinR	1548e902cd	Add MonCoods size macro	2021-11-08 09:41:23 -05:00
Blackforest92	76ba9d835a	pulled latest RHH battle_engine 08-11-2021	2021-11-08 16:38:42 +07:00
BuffelSaft	d3a845d511	Fix CanAIFaintTarget ... Rename CanAIFaintTarget to CanIndexMoveFaintTarget and create a new function, CanAIFaintTarget, that checks if any known move can KO the target.	2021-11-08 20:37:28 +13:00
ghoulslash	a90cf4a501	Merge pull request #1724 from AsparagusEduardo/BE_TerrainMoves ... Moves affected by Terrain: Camouflage, Secret Power & Terrain Pulse	2021-11-07 17:39:03 -05:00
GriffinR	c4169cfd29	Disambiguate cry functions	2021-11-07 14:26:09 -05:00
GriffinR	54b254a829	Add CRY_MODE constants	2021-11-07 13:33:05 -05:00
BuffelSaft	e407883b58	Rethink final strike effects ... This is now checked in SetMoveEffect instead of in each move that should behave this way. Some effects will need to be redone to make them play nice with this change, but some just work as is.	2021-11-07 20:31:09 +13:00
BuffelSaft	d30f2b5712	Fix move effects list ... Fixed it properly this time!	2021-11-07 15:22:33 +13:00
BuffelSaft	9351df5ed8	Revert "Update move effect defines" ... This reverts commit be518608e8.	2021-11-07 12:25:26 +13:00
BuffelSaft	c69e7666e7	Update battle_move_effects.h	2021-11-07 12:22:55 +13:00
BuffelSaft	be518608e8	Update move effect defines ... Removing move effects above the ones that have stat change animations causes the wrong stat change to be shown, so I've reordered the list to fix that.	2021-11-07 12:16:06 +13:00
BuffelSaft	72d12a575d	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-11-07 12:13:18 +13:00
Eduardo Quezada D'Ottone	4e6a459b14	Optimized terrain timers	2021-11-06 19:46:52 -03:00
Eduardo Quezada D'Ottone	8773e552ac	Organized config and added failsafe to AnimTask_SetCamouflageBlend	2021-11-06 19:24:06 -03:00
Eduardo Quezada D'Ottone	1c4a0c205a	Camouflage types config + extra terrains	2021-11-06 19:09:35 -03:00
Eduardo Quezada D'Ottone	b220da1d2a	Updated NaturePowerMoves table for new terrains + added failsafe in case the terrain isn't defined in the table	2021-11-06 18:50:01 -03:00
Eduardo Quezada D'Ottone	e9804a5023	Secret Power animation config	2021-11-06 17:32:34 -03:00
Eduardo Quezada D'Ottone	328976bf81	Secret Power effect config	2021-11-06 17:05:13 -03:00
ghoulslash	da6ec51fc2	merge w be	2021-11-06 10:43:35 -04:00
ghoulslash	41bf1dc2f4	merge w be	2021-11-06 10:40:57 -04:00
ghoulslash	f7d11527aa	Merge pull request #1867 from AsparagusEduardo/BE_synchroToxic ... Config for Synchronize's interaction with toxic poisoning	2021-11-06 10:36:50 -04:00
Eduardo Quezada D'Ottone	ae8de0f07a	Merge branch 'BattleEngine' into BE_TerrainMoves ... # Conflicts: # data/battle_scripts_1.s # include/constants/battle_move_effects.h # src/battle_util.c	2021-11-06 10:44:05 -03:00
BuffelSaft	5acebe32aa	Merge pull request #1817 from LOuroboros/photonGeyser ... Implemented Photon Geyser and Shell Side Arm	2021-11-06 16:04:53 +13:00
Eduardo Quezada D'Ottone	202827068c	a ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2021-11-05 21:25:42 -03:00
Eduardo Quezada D'Ottone	8e49e3e653	Config for Synchronize's interaction with toxic poisoning	2021-11-05 21:16:13 -03:00
BuffelSaft	4007a8d1f8	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into relic_song	2021-11-06 11:52:51 +13:00
Eduardo Quezada D'Ottone	6c70a6b872	Merge pull request #1863 from LOuroboros/soulDewBE ... Added a battle config for the Soul Dew	2021-11-05 17:09:44 -03:00
LOuroboros	5f458c9cd3	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser	2021-11-05 10:58:53 -03:00
ghoulslash	0b2542e447	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into smart_wild_ai	2021-11-05 09:46:12 -04:00
LOuroboros	05c7f7ebfb	Fixed the comment for I_SOUL_DEW_BOOST	2021-11-05 10:39:27 -03:00
LOuroboros	d15eeeb8eb	Fixed the comment for B_SOUL_DEW_BOOST	2021-11-05 10:37:41 -03:00
BuffelSaft	ee83d1142c	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1	2021-11-05 21:40:05 +13:00
BuffelSaft	bf786c6c9a	Fix Magma Storm ... Fix the strings and animation displayed when Magma Storm. Also move gTrappingMoves to battle_script_message.c as it's only sued in this file, and this allows ARRAY_COUNT(sTrappingMoves) to replace the constant in SetMoveEffect.	2021-11-05 18:22:52 +13:00
BuffelSaft	a8d44f84a1	Merge pull request #1852 from Blackforest92/battle_engine_2 ... Update waterfall, trick room, & focus blast BG	2021-11-05 15:27:52 +13:00
BuffelSaft	6df3975fc6	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hunger_switch2	2021-11-05 14:32:33 +13:00
Eduardo Quezada D'Ottone	5eb8f1c158	Merge pull request #1855 from ghoulslash/be/abilityonside ... AI versions of CanPoisonType, CanBePoisoned and IsAbilityOnSide	2021-11-04 21:49:31 -03:00
GriffinR	e65677c944	Update modern linker script	2021-11-04 17:28:41 -04:00
LOuroboros	10a3c8f119	Added an item config for the Soul Dew	2021-11-04 17:29:17 -03:00
LOuroboros	671cbabc3d	Added a battle config for the Soul Dew	2021-11-04 17:25:31 -03:00
cbt6	0fe3881961	Rename WalkInPlaceFastest to WalkInPlaceFaster	2021-11-05 01:54:34 +08:00
ghoulslash	0ac6860855	Merge pull request #1810 from BuffelSaft/ai_improvements ... AI: Multi-strike moves, variable power moves, sleep check	2021-11-04 12:28:00 -04:00
GriffinR	be7d0bd3b0	Merge branch 'master' into doc-menu	2021-11-04 12:11:31 -04:00
GriffinR	17b657d83a	Finish menu documentation	2021-11-04 11:52:43 -04:00
LOuroboros	22f7e81bef	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry	2021-11-04 12:25:26 -03:00
LOuroboros	b64d506809	Made a function to lift Mimicry's effect	2021-11-04 12:20:31 -03:00
LOuroboros	4f251e6ec2	Moved VARIOUS_TRY_TO_REVERT_MIMICRY to VARIOUS_REMOVE_TERRAIN	2021-11-04 12:13:55 -03:00
LOuroboros	e0b53f87fc	Primal Reversion Tweaks ... -Fixed the inconsistent Primal Reversion activation in double battles. -Optimized the primal weather checks in attackcanceler a little. -Fixed the issue with multi-target fire/water moves during primal rain/sun.	2021-11-04 12:04:14 -03:00
ghoulslash	6b10801ee8	convert AI_IsabilityOnSide to bool	2021-11-04 10:43:33 -04:00
BuffelSaft	cecd341011	Fix Tar Shot ... If Tar Shot can't do anything to the target it should fail. Checking this is clunky, but it works.	2021-11-04 20:47:45 +13:00
BuffelSaft	28e78cb6c4	Gen 8 moves initial commit ... Full credit to Nunuchu42 and cfmnephrite for this code.	2021-11-04 19:50:54 +13:00
BuffelSaft	7d10097684	Replace IsTwoStrikesMove with FLAG_TWO_STRIKES ... Note that this flag does nothing until the Parental Bond PR is merged - it's just for the AI until then.	2021-11-04 17:11:56 +13:00
BuffelSaft	4a7ddb737b	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai_improvements	2021-11-04 15:51:11 +13:00
BuffelSaft	e930dae278	Remove ability pop up for Hunger Switch ... Morpeko should change form each turn without showing its ability.	2021-11-04 15:40:26 +13:00
BuffelSaft	616be576fc	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hunger_switch2	2021-11-04 15:29:38 +13:00
LOuroboros	b931e34172	Handled Mimicry's interaction with Steel Roller's effect	2021-11-03 23:23:28 -03:00
ghoulslash	4466fbd930	ai version of CanPoisonType, CanBePoisoned and IsAbilityOnSide	2021-11-03 21:36:33 -04:00
BuffelSaft	eeb40daede	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into pastel_veil2	2021-11-04 13:52:58 +13:00
GriffinR	d6f873ba69	Continue menu documentation	2021-11-03 20:38:23 -04:00
Eduardo Quezada D'Ottone	6ee2a3aba1	Merge branch 'BattleEngine' into booleanStandard ... # Conflicts: # src/battle_main.c	2021-11-03 20:44:25 -03:00
LOuroboros	f6628e301f	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry	2021-11-03 20:43:33 -03:00
BuffelSaft	6132f9a9fe	Merge pull request #1750 from ghoulslash/mirror_armor ... Mirror Armor	2021-11-04 11:43:59 +13:00
BuffelSaft	5a855db4ad	Fix prototype of CanBePoisoned	2021-11-04 11:08:37 +13:00
GriffinR	085f8adec6	Start remaining menu documentation	2021-11-03 17:38:08 -04:00
GriffinR	9a0618afc3	Add COPYWIN constants	2021-11-03 15:29:18 -04:00
ghoulslash	48c29a9cd8	proper mirror armor sticky web targeting	2021-11-03 15:05:52 -04:00
GriffinR	3e49ac804b	Merge branch 'master' into doc-finalmisc	2021-11-03 13:56:22 -04:00
GriffinR	e14210ce1f	Merge pull request #1536 from GriffinRichards/clean-braille ... Add font id constants, better braille support	2021-11-03 13:17:29 -04:00
GriffinR	0ba22ca112	Merge pull request #1534 from GriffinRichards/doc-btrans ... Document battle transition	2021-11-03 11:26:20 -04:00
LOuroboros	af6e72ecfe	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser	2021-11-03 08:56:01 -03:00
Blackforest92	b9c23f7c62	Update waterfall, trick room, & focus blast BG	2021-11-03 16:29:09 +07:00
BuffelSaft	6ce1f01b8c	Hunger Switch and Aura Wheel ... Implement the ability Hunger Switch and the move Aura Wheel.	2021-11-03 19:45:03 +13:00
BuffelSaft	74c85b5818	Implement Relic Song's form change ... Meloetta transforms into its pirouette form after using Relic Song, unless it has Sheer Force or the move has no effect. It also has a chance to put both targets to sleep.	2021-11-03 17:23:33 +13:00
BuffelSaft	f323e2c047	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into pastel_veil	2021-11-03 14:18:28 +13:00
GriffinR	afb9ff3a40	Document files with a few remaining symbols	2021-11-02 18:06:06 -04:00
cbt6	3556024a06	Distinguish clearly the two enums related to speed	2021-11-03 02:51:30 +08:00
cbt6	3f5f057ebe	Rename GoSpeedX functions to WalkNormal, WalkFast, etc.	2021-11-03 01:50:53 +08:00
cbt6	4cedd2d551	Rename WalkFastest functions to WalkFaster	2021-11-03 01:50:53 +08:00
LOuroboros	69b42de0d9	Implemented Mimicry ... Thanks to AsparagusEduardo for helping me optimize RestoreBattlerOriginalTypes.	2021-11-02 14:44:55 -03:00
ghoulslash	4c9f48e9d8	Merge pull request #1842 from AsparagusEduardo/be_Gen8ContestData ... Added Gen 8 contest data	2021-11-02 12:50:45 -04:00
ghoulslash	ffcba355b0	merge w be	2021-11-02 10:36:08 -04:00
BuffelSaft	95435b5f7f	Pastel Veil switchin effect attempt ... Battle script isn't working for partner for some reason.	2021-11-02 23:06:10 +13:00
BuffelSaft	40bced517a	Pastel Veil blocks poison for whole side ... Tested vs Toxic, Toxic Thread and Sludge with 100% effect chance.	2021-11-02 20:00:57 +13:00
Blackforest92	2d5ed4a1e2	Allow Giga Impact fadein background & upgrade its graphic	2021-11-02 12:53:11 +07:00
BuffelSaft	1e3b3d482b	Merge pull request #1838 from Blackforest92/battle_engine ... Edit Spacial Rend and Hurricane background	2021-11-02 17:11:47 +13:00
Eduardo Quezada D'Ottone	8332bfae46	Gen 8 combo moves	2021-11-01 21:59:34 -03:00
Eduardo Quezada D'Ottone	f3013d8ee9	Standarized Solarbeam into Solar Beam	2021-11-01 18:36:35 -03:00
GriffinR	54a70ca4d4	Merge pull request #1530 from GriffinRichards/doc-graphics ... Label remaining symbols in graphics.c	2021-11-01 17:00:06 -04:00
ghoulslash	98b4b821dc	merge with be	2021-11-01 13:55:55 -04:00
ghoulslash	a1e64fce4f	handle simple beam, gastro acid	2021-11-01 13:50:57 -04:00
ghoulslash	b5d20da927	merge with be	2021-11-01 11:36:18 -04:00
BuffelSaft	5d678bc2ce	Fix move effect defines ... Had a define in a comment, which offset all the new move effects and misaligned their battle scripts.	2021-11-01 23:51:03 +13:00
BuffelSaft	0345dea918	Replace EFFECT_DOUBLE_HIT with FLAG_TWO_STRIKES ... This removes the need to have separate move effects for Twineedle, Double Iron Bash, and any custom two strike moves.	2021-11-01 23:39:37 +13:00
BuffelSaft	fb25e1ac98	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-11-01 22:37:23 +13:00
GriffinR	ef2971d8dc	Convert GF ROM header to C	2021-11-01 01:42:02 -04:00
Blackforest92	9b6cd383a4	Optimized Rock Wrecker and Hurricane	2021-11-01 01:06:39 +07:00
Blackforest92	e59d0dd5cf	clean Spacial Rend background	2021-10-31 22:58:43 +07:00
ghoulslash	52d4d1cd34	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into utility_umbrella	2021-10-31 11:40:00 -04:00
ghoulslash	bc170f3a43	merge with be	2021-10-31 11:04:39 -04:00
GriffinR	36039e1b86	Convert fonts.s to C	2021-10-31 01:44:18 -04:00
ghoulslash	e1f0e6285b	Merge pull request #1828 from BuffelSaft/gorilla-tactics ... Implement Gorilla Tactics	2021-10-30 21:44:33 -04:00
ghoulslash	468ee66cd8	fix synthesis and leaf guard w utility umbrella	2021-10-30 11:04:50 -04:00
GriffinR	875be8a8a8	Merge pull request #1528 from GriffinRichards/doc-ereaderscr ... Document ereader screen	2021-10-30 09:34:14 -04:00
ghoulslash	ee7b63e372	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into utility_umbrella	2021-10-30 09:26:33 -04:00
ghoulslash	f4537b1213	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into wandering_spirit	2021-10-30 09:14:32 -04:00
Blackforest92	799852ea77	Introduce alternate Steel Beam	2021-10-30 17:00:55 +07:00
BuffelSaft	52054e4bfe	Fix Corrosion, Poison Touch ... - CanBePoisoned now calls CanPoisonType instead of overriding it. Poison Touch now activates only if the attacker actually damaged the target. Partially implemented Pastel Veil.	2021-10-30 21:12:18 +13:00
BuffelSaft	47bfeaeecd	Implement Gorilla Tactics ... It's Choice Band but as an ability.	2021-10-30 18:31:44 +13:00
ghoulslash	af914ee7ed	merge w be	2021-10-29 22:33:50 -04:00
ghoulslash	28bc7dc14d	start ability	2021-10-29 22:32:19 -04:00
BuffelSaft	6b65ef5bcf	Merge pull request #1824 from ghoulslash/itemheal_fix ... Fix iteam healing after a failed move	2021-10-30 15:25:28 +13:00
BuffelSaft	f0e9b09258	Merge pull request #1822 from ghoulslash/harvest ... fix recycle and harvest	2021-10-30 15:00:56 +13:00
GriffinR	f51247615e	Finish documenting battle_transition	2021-10-29 18:32:53 -04:00
cbt6	9a1764f83e	Label some animation index numbers	2021-10-30 01:37:49 +08:00
GriffinR	07bf225f94	Continue battle_transition documenting	2021-10-29 11:24:36 -04:00
ghoulslash	2502820e83	document a couple hitmarkers. fix failing moves not updating hp from own healing effects	2021-10-29 09:03:14 -04:00
ghoulslash	204748e01a	fix recycle and harvest	2021-10-28 17:52:52 -04:00
ghoulslash	f342e7c590	merge with be	2021-10-28 17:03:10 -04:00
ghoulslash	e2e31f0b74	skill swap config option for switchin abilities	2021-10-28 16:53:00 -04:00
LOuroboros	a77f058146	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser	2021-10-28 14:24:43 -03:00
ghoulslash	34e966fdee	Merge pull request #1815 from LOuroboros/hyperspaceFury ... Implemented Hyperspace Fury	2021-10-28 13:20:33 -04:00
LOuroboros	82101d3581	Optimizations	2021-10-28 14:02:43 -03:00
LOuroboros	28522f3ffb	Fixed Hyperspace Fury not breaking through protections ... Also repositioned VARIOUS_JUMP_IF_SPECIES.	2021-10-28 12:09:44 -03:00
ghoulslash	bebaded415	merge with be	2021-10-27 16:48:38 -04:00
GriffinR	41ecae91f8	Label remaining symbols in graphics.c	2021-10-27 13:47:18 -04:00
LOuroboros	8c35a68060	Quick syntax tweaks	2021-10-27 11:19:39 -03:00
LOuroboros	fc7f1acf20	Merge branch 'Photon_Geyser' of https://github.com/MissingNoL/pokeemerald-expansion into photonGeyser	2021-10-27 11:13:59 -03:00
LOuroboros	1ab8c84f41	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hyperspaceFury	2021-10-26 21:23:21 -03:00
Eduardo Quezada D'Ottone	773c773bac	Merge remote-tracking branch 'RHH/battle_engine' into BE_ghostEscape ... # Conflicts: # include/constants/battle_config.h	2021-10-26 20:35:01 -03:00
GriffinR	b0c27a8521	Document ereader screen	2021-10-26 15:44:42 -04:00
GriffinR	f9f91be60a	Merge pull request #1527 from cbt6/field-player ... Document field player functions	2021-10-26 14:29:44 -04:00
GriffinR	d6571f2355	Merge pull request #1525 from GriffinRichards/doc-recmix ... Document remainder of Record Mixing	2021-10-26 14:18:38 -04:00
cbt6	b3d779fd0d	Document field player functions	2021-10-27 01:39:00 +08:00
BuffelSaft	adcf563ba1	Add missing berry data ... Certain gen 4+ berries were missing graphics and berry data. Adding this data allows them to be viewed and planted.	2021-10-26 14:42:06 +13:00
GriffinR	4f7f6c1082	Merge pull request #1526 from sphericalice/doc-curtain-special ... Document the CloseBattlePikeCurtain special	2021-10-25 16:10:45 -04:00
sphericalice	7b5267c799	Rename TILESET_WIDTH to METATILE_ROW_WIDTH	2021-10-25 20:51:04 +01:00
ghoulslash	07d2f73306	Merge pull request #1804 from AsparagusEduardo/PE_shedinjaball ... Config for Shedinja needing a Poké Ball to be created	2021-10-25 15:49:25 -04:00
sphericalice	5bce17cbce	Fix typo in the TILESET_WIDTH comment	2021-10-25 18:11:06 +01:00
sphericalice	120e75d275	Document the CloseBattlePikeCurtain special	2021-10-25 18:03:14 +01:00
GriffinR	a612c27f2d	Drop battle transition 'phase' terminology	2021-10-25 10:20:48 -04:00
GriffinR	6dc3c9864c	Merge pull request #1520 from GriffinRichards/doc-random ... Document random remaining symbols	2021-10-24 23:43:17 -04:00
Eduardo Quezada D'Ottone	44625561e5	Taunt turn config	2021-10-24 20:21:54 -03:00
Eduardo Quezada D'Ottone	70aeaf288f	Rough Skin damage config	2021-10-24 20:07:22 -03:00
Eduardo Quezada D'Ottone	8699db942b	More ordering	2021-10-24 20:03:21 -03:00
GriffinR	7a89ad98c3	Document record mixing hall records	2021-10-24 16:13:07 -04:00
GriffinR	ab80264921	Merge pull request #1519 from GriffinRichards/doc-mgift ... Document Mystery Gift	2021-10-24 15:50:39 -04:00
GriffinR	7f3c529935	Document record mixing mail swap	2021-10-24 15:49:19 -04:00
BuffelSaft	4310868bee	AI handles multi-strike and fixed dmg moves ... Does not account for Parental Bond or Beat Up yet as those require some functions from #1676.	2021-10-24 18:49:17 +13:00
Eduardo Quezada D'Ottone	71ff664700	Ordered config into new categories	2021-10-23 20:11:02 -03:00
Eduardo Quezada D'Ottone	d95351dd97	Merge branch 'BattleEngine' into BE_config ... # Conflicts: # include/constants/battle_config.h	2021-10-23 19:46:33 -03:00
LOuroboros	d31700d2ac	Replaced the Red and Blue Orbs' sprites	2021-10-23 13:49:02 -03:00
Eduardo Quezada D'Ottone	abb8a97d21	Merge pull request #1616 from LOuroboros/statCalcs ... Added configs for modern post-battle stat calcs	2021-10-23 13:35:21 -03:00
Eduardo Quezada D'Ottone	9a8b88bdb3	Updated config description	2021-10-23 11:59:57 -03:00
Eduardo Quezada D'Ottone	76b6250104	Merge branch 'battle_engine' into plasmaFists	2021-10-23 11:06:34 -03:00
Jademalo	62436d9f67	IDE support formatting and consistency	2021-10-23 10:10:00 +01:00
Eduardo Quezada D'Ottone	382ec13492	Merge pull request #1752 from ghoulslash/quick_draw ... Quick Draw	2021-10-22 22:39:03 -03:00
Eduardo Quezada D'Ottone	d0253640fb	Merge pull request #1739 from LOuroboros/primalReversionBE ... Implemented Primal Reversion	2021-10-22 22:27:45 -03:00