5233 Commits

Author	SHA1	Message	Date
DizzyEggg	44d2cc7232	Fix bugs related to Trainer Slide messages (#2699) ... * start working on trainer slides * use cmd->nextInstr	2023-02-27 09:11:25 +01:00
LOuroboros	fe09f3e0d3	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate	2023-02-26 23:42:01 -03:00
DizzyEggg	4bdca43dbd	refactor mega evolution indicator sprite	2023-02-26 12:51:35 +01:00
Zunawe	f376b71f7c	Fix wrong route in item flag name	2023-02-25 13:48:39 -08:00
Eduardo Quezada	31ab56bceb	Fixed footprint symbol names.	2023-02-25 09:23:34 -03:00
Eduardo Quezada	ca81d7a0f9	Forgot about Jangmo-o	2023-02-24 21:58:09 -03:00
Eduardo Quezada	bbefee6bd4	Use proper symbol styles for Hakamo-O and Kommo-O	2023-02-24 15:22:58 -03:00
Eduardo Quezada	079ca8ab29	Renamed MON_DATA_SPECIES2 to MON_DATA_SPECIES_OR_EGG for clarification	2023-02-24 07:53:02 -03:00
Alex	48391d8eff	Basculegion female form	2023-02-24 08:46:34 +01:00
Eduardo Quezada	d330ca051a	Document music usage to make it easier to search for a specific track	2023-02-23 11:44:23 -03:00
Eduardo Quezada	f5aa3b8272	Document the 2 different sText_GotchaPkmnCaught	2023-02-23 11:43:40 -03:00
ghoulslash	827bf11307	Merge pull request #2660 from DizzyEggg/ace_voltswitch ... Fix Volt Switch / Roar with ace pokemon	2023-02-23 09:20:18 -05:00
Alex	a870ec3c22	enamorus_t cry, basculegionf sprite, new typhlosion back sprite	2023-02-23 15:20:12 +01:00
DizzyEggg	dc83708443	Remove unused script BattleScript_TargetAbilityStatRaiseOnMoveEnd	2023-02-22 22:51:59 +01:00
Zunawe	60be59d18b	Fix wrong route in hidden item flag name	2023-02-22 13:13:57 -08:00
Alex	1f694ae7ed	missing pla sprites	2023-02-22 20:41:01 +01:00
DizzyEggg	877e3fd6af	merge with upcoming	2023-02-22 19:27:42 +01:00
DizzyEggg	e0b76e98ff	Add MOVE_SHELL_TRAP Effect (#2716) ... * implemented Shell Trap Co-authored-by: AgustinGDLV <agustingomezdelavega@gmail.com>	2023-02-22 13:55:34 +00:00
DizzyEggg	31138455de	remove unneeded VARIOUS_JUMP_IF_NO_VALID_TARGETS	2023-02-22 09:28:12 +01:00
Eduardo Quezada	5ca9213d07	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # src/battle_script_commands.c	2023-02-21 17:47:02 -03:00
DizzyEggg	61064ab07e	Merge branch 'upcoming' into fix_abilities_empty_field	2023-02-21 16:22:26 +01:00
Martin Griffin	29c64c82f3	Test Red Card ... Dragon Tail activates Red Card if the target does not switch.	2023-02-21 10:44:58 +00:00
Martin Griffin	afe09e9653	Test Dragon Tail ... Remove the "But it failed!" message if the foe cannot be switched.	2023-02-21 10:43:57 +00:00
LOuroboros	24581426a1	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate	2023-02-21 04:46:28 -03:00
LOuroboros	3a91a5c930	Added new trainer slide-in msg conditions ... Now they can say something: -When their last Pokémon's HP is between 25% and 50%. -When a critical hit is dealt to their first Pokémon for the first time. -When a super effective hit is dealt to their first Pokémon for the first time. -When a STAB move is used against (but doesn't faint) the opponent's Pokémon. -When the Player's Pokémon's move doesn't affect the opponent's Pokémon. -When they're about to trigger a Mega Evolution. -When they're about to trigger a Z-Move. Misc. changes: -Split GetEnemyMonCount for readability's sake. -Optimized the size allocated to trainerSlideLowHpMsgDone.	2023-02-21 04:40:02 -03:00
Zunawe	8f74a6777a	Fix spelling mistake for item flag	2023-02-20 18:17:30 -08:00
DizzyEggg	03915524c5	Fix switch-in abilities activating on empty field	2023-02-20 12:42:06 +01:00
DizzyEggg	53180ebf87	Update Healing wish to gen5 / gen8 mechanics (#2708) ... * Updated Healing Wish and added config * Fixed Lunar Dance message Co-authored-by: AgustinGDLV <agustingomezdelavega@gmail.com> Co-authored-by: AgustinGDLV <103095241+AgustinGDLV@users.noreply.github.com> Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>	2023-02-20 11:25:43 +00:00
GriffinR	f888021c8f	Merge pull request #1857 from GriffinRichards/sync-mapjson ... Sync mapjson	2023-02-19 20:48:13 -05:00
DizzyEggg	380af442c3	Fix buggy pokemon anims with Illusion (#2639) ... * try illusion fix * fix	2023-02-19 12:05:56 +01:00
Eduardo Quezada D'Ottone	ec343cef02	Config to have Shuckle make Berry Juice from Oran Berries (#2331) ... * Removed unused ifdefs and made actually check for Z Power Ring * Config to have Shuckle make Berry Juice from Oran Berries * Ordered species-specific configs	2023-02-19 10:45:59 +01:00
DizzyEggg	66d2f253a1	merge with master	2023-02-17 15:43:15 +01:00
DizzyEggg	0c523f9518	Fix Magic bounce powder moves against grass types (#2633) ... * Fix Magic bounce powder moves against grass types	2023-02-17 13:55:51 +00:00
DizzyEggg	56c9564e7a	8th gen Howl's effect (#2700) ... * Howl gen8 effect	2023-02-17 10:28:46 +00:00
Eduardo Quezada D'Ottone	625a7622e2	Merge pull request #2697 from AsparagusEduardo/RHH/sync/pret_20230214 ... It's ya boi, pret merge! (pret merge 2023/02/16)	2023-02-16 21:57:41 -03:00
DizzyEggg	d637ee3b13	Fix After You for gen8 (#2646) ... Fix After You	2023-02-16 20:59:36 +00:00
Eduardo Quezada	f4f8ab6ee9	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange	2023-02-16 17:06:49 -03:00
ghoulslash	f4ef67d897	Merge pull request #2689 from DizzyEggg/grenja ... Fix Battle Bond activating multiple times in battle	2023-02-16 09:36:02 -05:00
ghoulslash	6b0b427d93	Merge pull request #2680 from DizzyEggg/mirror_armor ... Fix Mirror Armor against Clear Body	2023-02-16 09:29:04 -05:00
DizzyEggg	978d342953	use NUM_BATTLE_SIDES	2023-02-16 15:26:26 +01:00
Eduardo Quezada	7ddebb6671	Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214 ... # Conflicts: # data/battle_ai_scripts.s # src/menu_specialized.c # src/mystery_gift_menu.c	2023-02-15 14:18:00 -03:00
Eduardo Quezada	b62e5aa72e	Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214 ... # Conflicts: # src/battle_main.c # src/field_specials.c # src/trade.c	2023-02-15 14:11:03 -03:00
Eduardo Quezada	dbd02d3a56	Clarified Champion Ribbon's description to avoid being interpreted as needing to beat the champion in both RSE and FRLG.	2023-02-15 14:06:42 -03:00
Eduardo Quezada	bd54990333	Review changes	2023-02-15 13:56:11 -03:00
GriffinR	671c9c5353	Merge branch 'master' into doc-chat	2023-02-15 10:57:05 -05:00
GriffinR	a322379feb	Merge branch 'master' into doc-windows	2023-02-15 10:04:48 -05:00
DizzyEggg	3f0f7c6b7f	Fix Battle Bond activating multiple times in battle	2023-02-15 15:30:29 +01:00
GriffinR	d3d680c1dd	Sort metatile labels alphabetically	2023-02-14 14:36:27 -05:00
GriffinR	b656565af0	Standardize RS mossdeep gym metatile labels	2023-02-14 11:42:13 -05:00
GriffinR	0df56b808d	Remove duplicate metatile label sections	2023-02-14 11:40:15 -05:00
ghoulslash	908b509401	Fix Round's Base Power calc, Add Turn order effects (#2602) ... * fix round base power calc, add turn order change * remove unused callnative cmd * fix round turn order update * fix moveTarget getting set incorrectly in HandleAction_UseMove. also redirection doesn't affect MOVE_TARGET_ALL_BATTLERS --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2023-02-14 16:49:50 +01:00
DizzyEggg	0577d8d04d	Fix Mirror Armor against Clear Body	2023-02-13 14:44:34 +01:00
DizzyEggg	5d958e245a	Merge pull request #2669 from Jaizu/giga_impact_contests ... Fix Giga Impact on contests.	2023-02-13 09:22:24 +01:00
Eduardo Quezada	a937b3221a	Documented Ribbons	2023-02-11 23:16:24 -03:00
Eduardo Quezada	96865f66af	Updated term to modernFatefulEncounter	2023-02-11 22:36:42 -03:00
Eduardo Quezada	6da5e0a280	Rename eventLegal to fatefulEncounter	2023-02-11 17:13:53 -03:00
sbird	4bcbb7c9e1	[intro] refactor expansion intro	2023-02-09 23:12:29 +01:00
Jaizu	9f7267e48d	Fix Giga Impact on contests.	2023-02-09 11:29:29 +01:00
GriffinR	c32fbf594a	Merge pull request #1851 from GriffinRichards/doc-fldspc ... Document remaining field_specials task data	2023-02-08 22:34:57 -05:00
DizzyEggg	0048e59e05	Fix SpeciesInfo struct offsets	2023-02-08 22:08:12 +01:00
GriffinR	de56e400ff	Sync clone object macro	2023-02-08 13:11:10 -05:00
Eduardo Quezada D'Ottone	8381b14c51	Implemented Xhyzi's RHH copyright intro (with config) (#2415) ... * Rhh & Pret Copyright Screen * Porygon recovered his voice * Expansion text --------- Co-authored-by: Xhyzi <xhyzdot@gmail.com> Co-authored-by: Jaizu <jaizu85@gmail.com>	2023-02-08 15:54:12 +01:00
DizzyEggg	896b575c07	Fix volt switch breaking ace pokemon	2023-02-08 12:42:38 +01:00
DizzyEggg	ff088752e7	Insomnia ability pop-up (#2643) ... * Insomnia ability pop-up * remove B_MSG_STAYED_AWAKE_USING constant	2023-02-07 18:47:23 +01:00
ghoulslash	7e9d40d401	Merge pull request #2645 from DizzyEggg/damp_aftermath ... Damp shows ability pop-up when reacting with Aftermath	2023-02-07 10:18:23 -05:00
DizzyEggg	dcb63e1518	Merge pull request #2610 from ghoulslash/be/animsilktrap ... Silk trap Animation	2023-02-07 16:13:53 +01:00
DizzyEggg	f762ed728d	remove pointless timers from disable struct	2023-02-07 15:10:20 +01:00
DizzyEggg	47ebf2e167	hmm	2023-02-07 13:33:43 +01:00
DizzyEggg	0dc5e1e685	aftermath damp pop-ups and string	2023-02-07 13:01:56 +01:00
Eduardo Quezada	101ea6522d	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # src/battle_util.c	2023-02-02 17:56:13 -03:00
GriffinR	5793a1a5e7	Correct some union room chat documentation	2023-02-02 11:41:02 -05:00
LOuroboros	4b5a6e2328	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1	2023-02-01 20:18:56 -03:00
Philipp AUER	8983739267	Merge pull request #2564 from mrgriffin/rhh-battle-tests ... Battle Tests	2023-02-01 22:18:17 +01:00
GriffinR	3b15fd34cc	Merge branch 'master' of https://github.com/pret/pokeemerald into constants-num-frames	2023-02-01 16:09:01 -05:00
GriffinR	4328ed8b19	Merge branch 'master' of https://github.com/pret/pokeemerald into doc-windows	2023-02-01 14:59:45 -05:00
GriffinR	9003966fcc	Misc field_specials cleanup	2023-02-01 11:48:55 -05:00
Martin Griffin	f1b9872bf0	Test moves, items, and abilities in battle ... Thank you to SBird for providing mgba-rom-test binaries and Spikes/Toxic Spikes tests! Co-authored-by: sbird <sbird@no.tld>	2023-02-01 13:53:57 +00:00
Jaizu	4eb7b7048e	Make transform not break	2023-01-31 12:41:07 +01:00
Jaizu	424f457ec2	Remove unused INHERITED_IV_COUNT define	2023-01-31 09:44:47 +01:00
ghoulslash	3f616215ea	add silk trap anim	2023-01-28 09:03:18 -05:00
Martin Griffin	bdb04da9a5	Refactor battle animations	2023-01-28 00:16:25 +00:00
Martin Griffin	cba4b78df6	Move-based mega evolution message for NPCs/recorded battles	2023-01-28 00:16:24 +00:00
Eduardo Quezada D'Ottone	53e41a2b3d	Merge pull request #2605 from mrgriffin/rhh-battle-tests-fixes ... Rhh battle tests fixes	2023-01-27 19:24:13 -03:00
ghoulslash	2b58593e33	Merge pull request #2595 from AsparagusEduardo/RHH/pr/data/Gen9Items ... Added some Gen9 item data and fixed Punching Glove's effect	2023-01-27 16:13:50 -05:00
Martin Griffin	a13ffdbfba	U-turn does not switch the user out if Emergency Exit activates	2023-01-27 00:57:22 +00:00
Eduardo Quezada	7774c9727d	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230125 ... # Conflicts: # tools/mapjson/mapjson.cpp	2023-01-25 20:28:55 -03:00
Eduardo Quezada	3288309c43	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # src/battle_script_commands.c	2023-01-25 19:57:19 -03:00
Eduardo Quezada	a044774896	Added Gen9 item data and fixed Punching Glove's effect	2023-01-24 16:47:54 -03:00
GriffinR	7681340966	Merge branch 'master' of https://github.com/pret/pokeemerald into sync-trade	2023-01-23 14:45:51 -05:00
ghoulslash	321634ed3b	Silk Trap Effect (#2512) ... * add silk trap effect, analog of obstruct Co-authored-by: ghoulslash <pokevoyager0@gmail.com> Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-01-23 16:42:47 -03:00
Eduardo Quezada D'Ottone	1bfc922c72	Merge pull request #2471 from ghoulslash/be/gen9items ... Start Gen9 Hold Effects	2023-01-23 14:58:08 -03:00
Eduardo Quezada D'Ottone	2b22bdf1e7	Merge pull request #2579 from LOuroboros/allahu ... Fixed Explosion & Intimidate's 'interaction'	2023-01-23 11:37:06 -03:00
ghoulslash	f97ec1975a	merge w upcoming	2023-01-23 09:24:03 -05:00
GriffinR	29c1af50ca	Fix Best Streak stat name	2023-01-20 11:25:04 -05:00
Eduardo Quezada	749225ace1	Matching merge from upstream pret ... # Conflicts: # graphics/interface/menu_info.png # include/pokemon.h # src/battle_ai_switch_items.c # src/battle_anim_mons.c # src/battle_anim_water.c # src/battle_controller_opponent.c # src/battle_gfx_sfx_util.c # src/battle_main.c # src/battle_pike.c # src/battle_script_commands.c # src/data/pokemon/species_info.h # src/pokemon.c # src/pokemon_summary_screen.c	2023-01-20 12:31:54 -03:00
GriffinR	0851e55ccb	Merge pull request #1657 from PikalaxALT/sync_battle_anim_args ... Sync battle anim args	2023-01-18 12:16:49 -05:00
GriffinR	b7d92e8537	Revert incorrect constant usage, add new correct ones	2023-01-18 12:11:09 -05:00
GriffinR	d1e4bd44ce	Correct comment in maps.h	2023-01-18 11:54:06 -05:00
GriffinR	5a906c33ac	Merge branch 'master' into sync_battle_anim_args	2023-01-18 11:47:33 -05:00
GriffinR	0cc10a1ada	Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize	2023-01-18 11:07:12 -05:00
GriffinR	d68e81c2be	Clarify MB_SEMI_DEEP_WATER name	2023-01-17 21:32:55 -05:00
LOuroboros	773e7f0de2	Fixed Explosion & Intimidate's 'interaction'	2023-01-17 22:16:42 -03:00
GriffinR	d5a4bfcd6f	Merge pull request #1843 from GriffinRichards/colorize ... Colorize more grayscaled/incorrectly colored pngs	2023-01-15 12:48:42 -05:00
GriffinR	18384894e0	Merge pull request #1822 from AsparagusEduardo/pret/doc/typesEggGroups ... Made Types and Egg Groups into arrays	2023-01-15 00:27:20 -05:00
Eduardo Quezada	70d59d6aa9	Improve Easy Chat documentation	2023-01-15 02:15:11 -03:00
GriffinR	387ea563fc	Move FRLG trainer card gfx to own folder, fix tiles	2023-01-13 13:40:13 -05:00
Eduardo Quezada	ac4825ad28	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # src/battle_util.c	2023-01-13 11:50:47 -03:00
ghoulslash	c72274ee98	Merge pull request #2566 from AsparagusEduardo/RHH/pr/feature/breedBalls ... Config for ball inheritence when breeding	2023-01-13 09:35:15 -05:00
GriffinR	12cbb0b30f	Colorize and combine birch_bag/birch_grass	2023-01-12 15:22:23 -05:00
Bassoonian	333917941b	Add PLA+ obedience mechanics (with config)	2023-01-11 08:15:57 +01:00
GriffinR	b873d69679	Sync trade anim	2023-01-09 15:32:04 -05:00
LOuroboros	bdcc84f019	Updated the implementation	2023-01-09 15:18:22 -03:00
LOuroboros	dccceb9689	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux	2023-01-09 14:59:41 -03:00
ghoulslash	cc7c546011	Merge pull request #2473 from LOuroboros/mimicry ... Reimplemented Mimicry	2023-01-09 12:54:44 -05:00
LOuroboros	620a6a5e90	Extra review changes ... -Foolproofed the ability checks in ABILITYEFFECT_ON_WEATHER and ABILITYEFFECT_ON_TERRAIN -Made BattleScript_OverworldWeatherStarts and BattleScript_OverworldTerrain call the battle scripts that handle weather form changes, weather abilities, terrain seeds and terrain abilities. -Consequentially, I removed the activation for weather and terrain abilities that I added to TryDoEventsBeforeFirstTurn, and the activation of Protosynthesis in ABILITYEFFECT_ON_SWITCHIN. -Added a weatherAbilityDone to prevent abilities that lack self-checks like Protosynthesis from getting stuck in a loop. -Removed now pointless ABILITYEFFECT_WEATHER_FORM. I think Duke/Sneed69 added it to fix Castform's form change, but it no longer serves a purpose.	2023-01-09 14:22:14 -03:00
Eduardo Quezada	f8c9e7af40	Fixed config comment	2023-01-09 11:06:27 -03:00
Eduardo Quezada	1b0ce96e12	Config for ball inheritence when breeding	2023-01-09 02:16:29 -03:00
LOuroboros	c32f584940	Applied review changes	2023-01-08 19:50:27 -03:00
Eduardo Quezada	911541ba4f	Merge branch 'RHH/upcoming' into RHH/pr/feature/IncenseBaby ... # Conflicts: # include/config/pokemon.h	2023-01-08 18:48:01 -03:00
ghoulslash	da27df9f18	Merge pull request #2326 from AsparagusEduardo/RHH/pr/reworkScald ... Rolled EFFECT_SCALD into EFFECT_BURN_HIT with a config for its Gen6+ change	2023-01-08 16:25:29 -05:00
GriffinR	c91b13a12b	Merge branch 'master' of https://github.com/pret/pokeemerald into doc-windows	2023-01-07 13:30:11 -05:00
Eduardo Quezada D'Ottone	7622d84a4f	Revert "Removed Unown hack"	2023-01-07 11:39:56 -03:00
Eduardo Quezada	d72a3731d4	Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald ... # Conflicts: # include/constants/battle_move_effects.h	2023-01-06 15:25:49 -03:00
LOuroboros	72566e6323	Turned Stone Axe's and Ceaseless Edge's effects into MOVE_EFFECTs	2023-01-05 03:02:56 -03:00
Eduardo Quezada D'Ottone	34d27eca0e	Merge pull request #2457 from AsparagusEduardo/RHH/pr/cleanup/unown ... Removed Unown hack	2023-01-04 18:57:28 -03:00
Eduardo Quezada	74d8c587fe	Merge branch 'RHH/upcoming' into RHH/pr/cleanup/unown ... # Conflicts: # src/data/pokemon/species_info.h # src/data/pokemon_graphics/front_pic_anims.h	2023-01-04 17:58:54 -03:00
Eduardo Quezada	55be15f690	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2 ... # Conflicts: # include/config/pokemon.h	2023-01-04 16:19:57 -03:00
ghoulslash	1d2cb49bc6	Merge pull request #2542 from AsparagusEduardo/RHH/pr/config/multiTargetDmg ... Config to restore Gen 3's damage reduction to multi target moves	2023-01-04 09:18:39 -05:00
Eduardo Quezada	ca46c22533	Removed SpeciesInfo array defines	2023-01-04 08:14:34 -03:00
GriffinR	36c89d345c	Merge branch 'master' into doc-wnews	2023-01-03 22:28:21 -05:00
Eduardo Quezada	e0802f13a2	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20230103 ... # Conflicts: # include/link_rfu.h	2023-01-03 15:40:33 -03:00
LOuroboros	f1ca254c28	Updated the Mimicry reimplementation ... Mimicry is now a proud member of ABILITYEFFECT_ON_TERRAIN. Misc. changes: -Ditched the dependency on and usage of gBattlerAttacker for the effects inside ABILITYEFFECT_ON_WEATHER and ABILITYEFFECT_ON_TERRAIN. -Made Cmd_switchineffects activate ABILITYEFFECT_ON_TERRAIN to take into account overworld weather-induced field terrains. -Updated the text strings printed by the battle scripts inside the aforementioned AbilityBattleEffects caseIDs. -Removed constant label of unused VARIOUS_TRY_TO_APPLY_MIMICRY which I forgot about. -Updated ChangeTypeBasedOnTerrain, partly as a result of the aforementioned changes but also for optimization purposes. -There was never a reason to establish an empty scope, or to use GET_MOVE_TYPE and the variables that complemented it. -Removed case ABILITY_QUARK_DRIVE from AbilityBattleEffects' case ABILITYEFFECT_ON_SWITCHIN.	2023-01-03 02:27:41 -03:00
LOuroboros	d0f5653f5e	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry	2023-01-02 19:00:41 -03:00
Eduardo Quezada	a23501a4a3	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # src/battle_script_commands.c	2023-01-02 18:54:57 -03:00
LOuroboros	0a00942a26	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1	2023-01-02 16:00:13 -03:00
ghoulslash	2944ebfe7b	Merge pull request #2543 from AsparagusEduardo/RHH/pr/fix/shinyChances ... Reverting P_SHINY_BASE_CHANCE implementation as it wasn't accuerate to Gen6+	2023-01-02 13:55:36 -05:00
LOuroboros	cdfec0fc05	Updated B_DOUBLE_WILD_CHANCE	2023-01-02 15:42:30 -03:00
LOuroboros	13d8c0d167	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities	2023-01-02 14:34:24 -03:00
LOuroboros	ca32d43433	Streamlined ability-on-weather changes ... Also renamed activateweatherabilities and activateterrainabilities.	2023-01-02 14:32:56 -03:00
Eduardo Quezada	16e8a5dd7f	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # include/battle_util.h	2023-01-01 16:02:40 -03:00
LOuroboros	f2e63a2e41	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux	2022-12-31 03:33:42 -03:00
Eduardo Quezada D'Ottone	0e1836d42b	Merge pull request #2106 from Sneed69/PartyBattlerShouldAvoidHazards ... PartyBattlerShouldAvoidHazards rewrite	2022-12-30 17:55:53 -03:00
Eduardo Quezada D'Ottone	4dc72dcfc1	Merge pull request #1956 from SonikkuA-DatH/SonikkuA-DatH-Teatime2 ... Implementing Teatime effect	2022-12-30 17:49:54 -03:00
LOuroboros	e8dfb66c30	Adding ability effect triggers for terrains and weather ... A new, probably better way to handle the announcement trigger that abilities such as Protosynthesis and Quark Drive have, when the battle weather or the field terrain change. Misc. changes: -EFFECT_DAMAGE_SET_TERRAIN -> EFFECT_HIT_SET_REMOVE_TERRAIN -It's more appropriate as the effect can be used to force set a terrain or simply to remove an active terrain, after all. -The main reason for the rename was the inconsistency with the battle script's label. -Reverted accidentally committed change to B_DOUBLE_WILD_CHANCE, performed back in c8abf00c.	2022-12-30 03:25:16 -03:00
LOuroboros	0ef148dfbb	Applied more corrections ... -Removed BattleScript_WindRiderActivatesEnd2 -Tweaked the condition of Wind Power in AbilityBattleEffects -Renamed ApplySupremeOverlordModifier to GetSupremeOverlordModifier	2022-12-28 08:50:15 -03:00
LOuroboros	0159065dea	Removed Shell Trap ... It's time to let it go for my own mental sanity. Besides, it's a Gen. 7 move. I shouldn't have added it here.	2022-12-28 07:51:11 -03:00
GriffinR	d02d518917	Merge pull request #1829 from AsparagusEduardo/pret/doc/SaveBlockPadding ... Documenting padding in structs used by Saveblocks	2022-12-27 20:50:37 -05:00
Eduardo Quezada	1fc86e52b5	Reverting P_SHINY_BASE_CHANCE implementation as it wasn't accuerate to Gen6+	2022-12-27 21:18:20 -03:00
Eduardo Quezada	95f39c8c81	Config to restore Gen 3's damage reduction to multi target moves	2022-12-27 15:24:43 -03:00
SphericalIce	200b71be02	Fix Beat Up's battle script to avoid an out-of-bounds array access	2022-12-27 10:49:57 +00:00
Eduardo Quezada D'Ottone	b5b7631be7	Added guards to form_change_types.h	2022-12-26 09:14:28 -03:00
Eduardo Quezada	28cffda9d4	Hatch level config	2022-12-22 10:38:54 -03:00
Eduardo Quezada	d103025527	Merge branch 'RHH/upcoming' into RHH/pr/feature/palleteConversion2 ... # Conflicts: # include/config/pokemon.h	2022-12-22 10:30:01 -03:00
LOuroboros	4bb86c5d96	Implemented Barb Barrage's effect	2022-12-21 19:48:50 -03:00
LOuroboros	1229fa752a	Fixed Triple Axe's target, added its effect and fixed Ceaseless Edge's	2022-12-21 19:48:49 -03:00
LOuroboros	2cb9400ef0	Implemented Dire Claw's effect	2022-12-21 19:48:48 -03:00
LOuroboros	3ce4869766	Implemented Shell Trap's effect	2022-12-21 19:48:10 -03:00
LOuroboros	ae482ed1f4	Implemented Ceaseless Edge's effect	2022-12-21 19:47:00 -03:00
Eduardo Quezada	4ed20dca8c	Forgot to restore config to GEN_LATEST	2022-12-21 17:28:24 -03:00
Eduardo Quezada	c0d4e14a61	Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald ... # Conflicts: # include/config/battle.h # include/constants/battle_move_effects.h	2022-12-21 12:46:09 -03:00
Eduardo Quezada	8840d0bbf6	Refactored incense baby checks into table and added Gen 9 config.	2022-12-21 12:31:59 -03:00
Martin Griffin	632ec92475	Minor Roost changes ... - Fix 'mon with Flying in type3 but not type1 or type2 is set to uninitialized roostTypes. - Remove unread third roostTypes element. - Option for Gen IV pure-Flying behavior.	2022-12-21 14:52:01 +00:00
LOuroboros	d943f891c5	Applied Wind Power and Wind Rider correction ... -Renamed TryActivateWindRiderLoop to BattleScript_TryTailwindAbilitiesLoop -Modified how it handles the check for Wind Rider by using a various and incorporated Wind Power into the mix because that ability is affected by Tailwind as well.	2022-12-21 10:08:16 -03:00
SonikkuA-DatH	2c28076696	Update include/constants/battle_script_commands.h ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-12-20 18:08:38 -08:00
LOuroboros	6153b8e904	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities	2022-12-20 07:11:36 -03:00
LOuroboros	c8abf00cac	Applied corrections ... Anger Shell: -Made it print a string from the gStatDownStringIds table while lowering Def and Sp. Def -Made it use the shiny new modifybattlerstatstage macro. -Made it activate multiple times per battle, as it should. Well-Baked Body: -Turned it into an absorbing ability. Wind Rider: -Turned it into an absorbing ability. -For its Tailwind interaction, I made it activate only when Tailwind kicks in successfully, instead of whenever it's active at the end of a turn. Guard Dog: -Updated its check inside BattleScript_EffectHitEscape. -Moved it from Cmd_forcerandomswitch to BattleScript_EffectRoar. Wind Power: -Split off its move end effect from Electromorphosis'. Electromorphosis: -Split off its move end effect from Wind Power's. Hadron Engine: -Merged its Switch In effect with Electric Surge's. Protosynthesis: -Fixed its stat boost. Quark Drive: -Fixed its stat boost. Cud Chew: -Updated its ENDTURN effect's berry check. Supreme Overlord: -Tweaked the looping i variable's data type, the order of the variables and the checks inside ApplySupremeOverlordModifier. Earth Eater: -Turned it into an absorbing ability. Misc changes: -Added a variable to set the amount of stat stages raised inside AbilityMoveEffects' case ABILITYEFFECT_ABSORBING. -Added a preproc config to update the text string that they print. -Limited the scope of atkHighestStat and defHighestStat in CalcMoveBasePowerAfterModifiers to Protosynthesis's and Quark Drive's effects.	2022-12-20 07:08:29 -03:00
SonikkuA-DatH	f6fab92ac8	Merge branch 'upcoming' into SonikkuA-DatH-Teatime2	2022-12-19 15:52:20 -08:00
Eduardo Quezada	1580f892a5	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # include/constants/pokemon.h # src/battle_script_commands.c	2022-12-19 18:53:26 -03:00
ghoulslash	79fa2c79e2	Merge pull request #2517 from LOuroboros/speed_swap ... Fixed Speed Swap's effect	2022-12-19 08:56:36 -05:00
SonikkuA-DatH	ffda816507	Update battle_script_commands.h ... Whoops, forgot the to copy paste various	2022-12-18 22:41:15 -08:00
SonikkuA-DatH	f0aee1f8d3	Merge branch 'upcoming' into SonikkuA-DatH-Teatime2	2022-12-18 17:50:39 -08:00
Eduardo Quezada	66d1c9bc65	Documenting padding in structs used by Saveblocks	2022-12-17 22:55:43 -03:00
Eduardo Quezada	6a57dcdc4c	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20221216 ... # Conflicts: # src/data.c # src/data/pokemon_graphics/front_pic_anims.h	2022-12-16 19:19:23 -03:00
GriffinR	2aa6a9c164	Remove two unreferenced metatile labels	2022-12-16 11:05:56 -05:00
LOuroboros	852f06deea	Updated SIDE constant usages	2022-12-15 17:44:56 -03:00
GriffinR	347a02ace1	Sync trade	2022-12-15 15:40:59 -05:00
LOuroboros	4c9446ed0a	Fixed Speed Swap's effect	2022-12-14 12:00:45 -03:00
LOuroboros	6ef30da492	Update battle.h	2022-12-13 02:44:49 -03:00
LOuroboros	a56cfd1aa7	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities	2022-12-12 19:55:48 -03:00
Eduardo Quezada	1290a9411d	Reorganized SpecialStatus struct to minimize padding.	2022-12-12 00:37:00 -03:00
ghoulslash	340278c83b	Merge pull request #2452 from LOuroboros/intimidate ... Optimized Intimidate's code	2022-12-11 22:04:16 -05:00
ghoulslash	e3e0d60222	Merge pull request #2467 from Bassoonian/gen9moves ... Generation IX Moves	2022-12-11 14:47:47 -05:00
LOuroboros	0d1f9d9613	Reimplemented Mimicry	2022-12-09 20:46:18 -03:00
sbird	0d5adac1e1	[debug, printf] add DebugPrintfLevel macro	2022-12-07 00:03:25 +01:00
sbird	fab26b99f1	[fix] DebugPrintf with no format arguments	2022-12-06 15:59:59 +01:00
ghoulslash	6d28882e44	start gen9 hold effects	2022-12-06 09:48:36 -05:00
LOuroboros	107ace784b	Implemented Mycelium Might's effect	2022-12-06 06:18:18 -03:00
LOuroboros	d6b9f07681	Implemented Earth Eater's effect	2022-12-06 05:30:21 -03:00
LOuroboros	a961980e0f	Implemented Toxic Debris' effect	2022-12-06 05:23:30 -03:00
LOuroboros	aa051dab02	Implemented Costar's effect	2022-12-06 05:23:30 -03:00
LOuroboros	7a52404fd3	Implemented Supreme Overlord's effect	2022-12-06 05:23:30 -03:00
LOuroboros	3c30e6bdc3	Implemented Sharpness' effect	2022-12-06 05:23:30 -03:00
LOuroboros	f96137eb5e	Implemented Cud Chew's effect	2022-12-06 05:23:30 -03:00
LOuroboros	24465858a7	Implemented the 4 Ruin Abilities	2022-12-06 05:23:29 -03:00
LOuroboros	de05c4dd56	Implemented Good as Gold's effect	2022-12-06 05:23:29 -03:00
LOuroboros	e25f843db3	Implemented Quark Drive's effect ... Also tweaked STRINGID_SUNLIGHTACTIVATEDABILITY and STRINGID_STATWASHEIGHTENED.	2022-12-06 05:23:29 -03:00
LOuroboros	a328088122	Implemented Protosynthesis' effect ... Also turned GetHighestStatId into a global function since Protosynthesis' effect uses it.	2022-12-06 05:23:29 -03:00
LOuroboros	34cafa746c	Implemented Electromorphosis' effect ... Also added a battle preproc config to check if the STATUS3_CHARGED_UP was already applied. Pokémon Scarlet and Violet don't check if this status flag was already applied on the target of abilities like Electromorphosis (and Wind Power until proven otherwise.) As a result, the game will trigger the ability multiple times if they're hit by a multihit move. This directive makes the code end the ability effect preemptively if the target does have the status flag applied.	2022-12-06 05:23:29 -03:00
LOuroboros	88cae380d0	Implemented Wind Power's effect	2022-12-06 05:23:29 -03:00
LOuroboros	4dc44150c5	Implemented Wind Rider's effect	2022-12-06 05:23:29 -03:00
LOuroboros	ca656b63b9	Added Well Baked Body's effect and misc. changes ... -Added a modifybattlerstatstage macro to handle stat stages in battle. -Rewrote the checks inside the case ABILITYEFFECT_MOVES_BLOCK of AbilityBattleEffects.	2022-12-06 05:21:24 -03:00
Bassoonian	58a54c90d2	Restore GEN_LATEST to GEN_8	2022-12-04 18:16:37 +01:00
GriffinR	f55443656f	Add NUM_TILES_PER_METATILE	2022-12-03 17:29:02 -05:00
LOuroboros	acb9c31bd4	Implemented Anger Shell's effect	2022-12-03 01:19:24 -03:00
LOuroboros	b0027cb78b	Implemented Seed Sower's effect	2022-12-02 23:31:41 -03:00
LOuroboros	653364fd71	Added the basic data for the Gen. 9 Abilities	2022-12-02 23:01:22 -03:00
Eduardo Quezada	9d1149c423	Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221124 ... # Conflicts: # src/pokemon.c	2022-11-29 17:40:09 -03:00
ghoulslash	34ba9b4e0d	convert a few various to callnatives	2022-11-28 14:36:19 -05:00
Eduardo Quezada	4bac880042	Removed Unown hack	2022-11-25 16:55:53 -03:00
Eduardo Quezada	e858b4e709	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124 ... # Conflicts: # include/battle.h # src/battle_ai_script_commands.c # src/battle_ai_switch_items.c # src/battle_dome.c # src/battle_main.c # src/battle_pike.c # src/battle_script_commands.c # src/battle_tower.c # src/data/pokemon/species_info.h # src/pokemon.c	2022-11-24 15:36:00 -03:00
Eduardo Quezada	7327be6f9e	Made Types and Egg Groups into arrays	2022-11-22 17:05:25 -03:00
GriffinR	483c3d5c13	Document wonder news	2022-11-22 02:17:03 -05:00
GriffinR	4736b4b14d	Merge pull request #1810 from AsparagusEduardo/pret/pr/baseStatsRename ... Renamed gBaseStats to gSpeciesInfo	2022-11-18 17:45:23 -05:00
GriffinR	5fa364256d	Merge pull request #1808 from AsparagusEduardo/pret/PR/numSides ... Introduce NUM_BATTLE_SIDES	2022-11-18 17:39:00 -05:00
Bassoonian	739680e425	Victory Dance effect	2022-11-18 22:23:34 +01:00
Bassoonian	29ae22183b	Mystical Power effect	2022-11-18 22:17:08 +01:00
Bassoonian	9512b3a57a	Implement Double Shock functionality with temporary string	2022-11-18 22:12:26 +01:00
Bassoonian	3ac3cb249e	Wicked Torque effect	2022-11-18 22:00:21 +01:00
Bassoonian	f7d1a12d2d	Data entry for gen9 moves	2022-11-18 12:15:44 +01:00
Eduardo Quezada	791c547b2c	Renamed missing overworld debug configs	2022-11-14 14:07:32 -03:00
Eduardo Quezada	540f4679bb	Implemented uses of Shiny config	2022-11-14 11:56:02 -03:00
Eduardo Quezada	011ec16f1e	Organized conffig files into their own folder and cleaned up	2022-11-14 11:03:49 -03:00
LOuroboros	11c99cac61	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux	2022-11-13 23:17:59 -03:00
LOuroboros	31a602f3b6	Optimized Intimidate's code	2022-11-12 18:03:46 -03:00
Eduardo Quezada	f2d0e547ac	Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221030 ... # Conflicts: # src/rom_header_gf.c	2022-11-09 19:54:44 -03:00
GriffinR	1d1c2d41bb	Add list menu cursor constants	2022-11-09 15:16:46 -05:00
Eduardo Quezada	2ef2134be1	Moved Hunger Switch to form change table.	2022-11-06 17:12:34 -03:00
Eduardo Quezada	62912f8caf	Battle indicator now depends on species instead of held item ... - This is to avoid a situation where a user would plop a Primal Groudon and its indicator would become Alpha if it doesn't have a Red Orb.	2022-11-06 16:01:07 -03:00
Eduardo Quezada	57bdb683ec	DoBurmyFormChange handled by FORM_CHANGE_END_BATTLE_TERRAIN	2022-11-05 23:27:40 -03:00
Eduardo Quezada	99536089cf	Renamed form change defines to be consistant with which function calls which	2022-11-05 22:02:25 -03:00
Eduardo Quezada	8f289714b2	Moved form change defines and descriptions to their own header	2022-11-05 21:36:45 -03:00
Eduardo Quezada	ceb5c8a00a	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange ... # Conflicts: # include/battle_util.h # src/battle_util.c	2022-11-05 20:11:33 -03:00
Eduardo Quezada	42f8e8c114	Multiple refactors ... - Added a general GetBattleFormChangeTargetSpecies instead of getting specific ones for Mega Evolution and Primal Reversion. - Added FORM_CHANGE_BATTLE_HP_PERCENT, to replace ShouldChangeFormHpBased. - Cleaned ifdefs for hold effects. - Finally removed UndoMegaEvolution. - FORM_CHANGE_FAINT and FORM_CHANGE_BATTLE_END restore to the first form before a battle form change if species isn't specified. - When changing from a form with more HP to one with less, now current HP is kept to fix Zygarde edge case. (Will likely need to be reworked for Dynamax, as it behaves differently) - Uses DoesSpeciesUseHoldItemToChangeForm in CanBattlerGetOrLoseItem.	2022-11-05 20:00:12 -03:00
BuffelSaft	1da4eb3b14	Merge pull request #2428 from AsparagusEduardo/RHH/pr/feature/DarkVoid ... Config for Dark Void being only usable by Darkrai	2022-11-05 22:42:51 +13:00
Eduardo Quezada	44bf4a15e3	Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald ... # Conflicts: # include/constants/battle_config.h # include/constants/battle_move_effects.h	2022-11-04 12:19:40 -03:00
ghoulslash	7a0e541413	workaround for GetBattlerHoldEffectParam to handle bug bite different battler id	2022-11-04 10:29:05 -04:00
ghoulslash	1e6903840a	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into be/bugbite	2022-11-04 09:29:45 -04:00
ghoulslash	d13431b4ab	merge w rhh master	2022-11-04 09:29:39 -04:00
Eduardo Quezada	edf4e45c4d	Config for Dark Void being only usable by Darkrai	2022-11-03 21:36:12 -03:00
BuffelSaft	c169a9523e	Merge branch 'upcoming' into fix-stat-boost-on-hit	2022-11-03 22:01:30 +13:00
BuffelSaft	736ca893b6	Fix abilities that raise target's stat after hit ... Fix Justified, Berserk, Rattled, Stamina and Water Compaction printing the wrong message when they activate. Steam Engine was also updated to follow the gen 5+ ability activation method style.	2022-11-03 21:54:56 +13:00
Eduardo Quezada	15c12af2cf	Using TryBattleFormChange in place of certain TryFormChange	2022-11-01 23:50:26 -03:00
LOuroboros	86e322dcea	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux	2022-11-01 22:41:31 -03:00
Eduardo Quezada D'Ottone	b8371500d3	Merge pull request #1676 from BuffelSaft/multistrike ... Multi-hit refactor and Parental Bond	2022-11-01 21:16:04 -03:00
ghoulslash	53061c7d62	Merge pull request #2391 from AsparagusEduardo/RHH/pr/sugardoodoodoodoodoodooaahhoneyhoney ... Implemented Honey's Sweet Scent functionality	2022-11-01 20:09:30 -04:00
ghoulslash	c6cb54b54e	Merge pull request #2319 from AsparagusEduardo/RHH/pr/Lures ... Implemented Lures and Repel/Lure "use another" menu	2022-11-01 20:05:15 -04:00
Eduardo Quezada	797c5514d3	Mega Evolution in form change tables	2022-11-01 18:37:23 -03:00
Eduardo Quezada	a57f6d184b	Fainting by poison in the overworld reverts forms	2022-11-01 12:24:04 -03:00
LOuroboros	5ebc996c51	Removed worthless DEBUG_FLAG_PC_FROM_DEBUG_MENU config	2022-10-30 22:03:14 -03:00
Eduardo Quezada	e4a439aa46	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 ... # Conflicts: # src/data/bard_music/moves.h # src/data/bard_music/pokemon.h	2022-10-30 12:30:38 -03:00