9480 Commits

Author	SHA1	Message	Date
Jaizu	a7ce3974ad	Apply feedback	2023-01-21 19:25:02 +01:00
Jaizu	c6811fb692	Ability popup fixes	2023-01-21 18:12:12 +01:00
ghoulslash	428ea97028	IsBattlerAlive instead of hp check	2023-01-21 12:11:12 -05:00
ghoulslash	a044084182	Remove redundant IsBattlerAlive checks from ITEMEFFECT_ORBS	2023-01-21 11:11:50 -05:00
ghoulslash	9e6c5725d0	add hp check to ITEMEFFECT_ORBS	2023-01-21 08:55:20 -05:00
GriffinR	29c1af50ca	Fix Best Streak stat name	2023-01-20 11:25:04 -05:00
Eduardo Quezada	4a9515e8db	Restored improvements from upstream	2023-01-20 12:34:15 -03: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	b7d92e8537	Revert incorrect constant usage, add new correct ones	2023-01-18 12:11:09 -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	4a9c4951ab	Merge pull request #1815 from tustin2121/patch-5 ... Adding FindObjectEventPaletteIndexByTag bugfix	2023-01-18 10:40:07 -05:00
GriffinR	a203c03eac	Add bugfix to LoadObjectEventPalette	2023-01-18 10:33:39 -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
Jaizu	a3ae182fc2	Add constants when using GetMonsStateToDoubles_2	2023-01-15 09:50:31 +01:00
GriffinR	c0e68f33f7	Colorize pokemon storage tiles	2023-01-15 00:39:51 -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
GriffinR	1707f82992	Combine/colorize status graphics	2023-01-13 12:53:08 -05:00
Eduardo Quezada D'Ottone	6e1981369b	Fixed Exp Candy S using the XS description	2023-01-13 13:22:27 -03: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	ee3f5033b3	Colorize contest/interface.png	2023-01-13 00:26:40 -05:00
Eduardo Quezada	77cc407386	Review change	2023-01-12 23:44:34 -03:00
GriffinR	12cbb0b30f	Colorize and combine birch_bag/birch_grass	2023-01-12 15:22:23 -05:00
GriffinR	5b3596108d	Add some missing PARTY_SIZE usage	2023-01-12 10:51:20 -05:00
Bassoonian	3b4cba9b51	Apply suggestions from code review ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2023-01-11 14:11:47 +01: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	ba21ffb3f2	Oopsie. Protosynthesis is NOT a terrain ability	2023-01-09 14:37:18 -03: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
LOuroboros	91b2e1bb50	More review changes and added lackings ... -Removed unnecessary special handling of terrain-inducing overworld weather states from ChangeTypeBasedOnTerrain. -Mimicry now activates normally for terrain-inducing overworld weather states. -Weather abilities now activate normally when switchineffects is called, and at the beginning of a battle. -Terrain abilities now activate normally at the beginning of a battle.	2023-01-09 07:55:55 -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	612ef46d82	Forgot to add these suggestions	2023-01-08 19:26:34 -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
Eduardo Quezada	c5ea97ecc3	Review changes	2023-01-08 18:42:39 -03:00
Eduardo Quezada	9250f8c994	Standarized Pichu/Light Ball/Volt Tackle interaction into their own table, allowing for custom combinations	2023-01-08 18:35:47 -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	f39f48fc51	Made MOVE_EFFECT_DIRE_CLAW a tiny bit prettier	2023-01-05 03:07:28 -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
LOuroboros	7e398ce80e	Corrected the AI conditionals	2023-01-04 12:45:49 -03:00
LOuroboros	9a6bdfb74f	Added AI conditionals for the new move effects in this batch	2023-01-04 12:13:34 -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
ghoulslash	a425de77a6	Merge pull request #2446 from LOuroboros/primal ... Updated AnimTask_PrimalReversion	2023-01-04 09:16:28 -05:00
ghoulslash	a6269f8cc7	Merge pull request #2559 from AsparagusEduardo/RHH/pr/sync/pretmerge_20230103 ... For me, it was tuesday. (pret merge 2023/01/03)	2023-01-04 09:15:08 -05:00
GriffinR	36c89d345c	Merge branch 'master' into doc-wnews	2023-01-03 22:28:21 -05:00
Eduardo Quezada D'Ottone	41d846c74c	Merge pull request #2551 from ghoulslash/be/frontier_bp ... Reshape sBattlePointAwards to be easier to read	2023-01-03 21:48:08 -03:00
ghoulslash	2ee26c6240	align cols	2023-01-03 19:36:19 -05:00
Eduardo Quezada	b897b7787e	Applied bugfix from upstream	2023-01-03 15:41:03 -03: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	bb218b1616	Updated HOLD_EFFECT_ZOOM_LENS check	2023-01-03 01:10:21 -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
ghoulslash	759ee8854a	Merge pull request #2470 from LOuroboros/dev_gen9_abilities ... Implemented the majority of the Gen. 9 Abilities	2023-01-02 13:39:38 -05:00
ghoulslash	a06135b2f4	Merge pull request #2539 from AsparagusEduardo/RHH/pr/fix/FixEgg ... Fixed Eggs sometimes reading garbage graphic data.	2023-01-02 13:27:28 -05:00
ghoulslash	82bf76588c	move challengeNum index to end of sBattlePointAwards, explicitly call out frontier facilities, modes	2023-01-02 13:12:46 -05: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	d3443396e2	Made Clear Body and similar abilities be normally affected by their own stat stage reductions	2023-01-01 10:45:38 -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
Bassoonian	453aa2ffe7	Fix faulty gBaseStats reference	2022-12-31 02:01:56 +01: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	2d222ad0a9	Merge pull request #2544 from LOuroboros/miscs ... Applied minor tweaks	2022-12-30 17:51:55 -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
Jaizu	c40c7e7e65	Fix breaking modern, correct labels.	2022-12-29 16:11:17 +01:00
Jaizu	e2d47a07f5	Fix ANIM_SPRITE on regular builds with BUGFIX. ... Dicussion about this being a BUGFIX define instead limiting it only to modern. Credit SBird.	2022-12-29 12:28:44 +01: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	9bad91b167	Applied minor tweaks ... -Made setbeakblast affect a specified battler instead of the gBattlerAttacker to justify the macro's layout. -Added Shell Trap to the list of moves unaffected by Encore. -Renamed CheckFocusPunch_ClearVarsBeforeTurnStarts into CheckChosenMoveForEffectsBeforeTurnStarts because that function doesn't just check for Focus Punch anymore, and it doesn't clear any variables either.	2022-12-28 08:33:31 -03:00
LOuroboros	f5c165ff0c	Updated Dire Claw's effect again ... Thanks to MGriffin for providing a much nicer code for it.	2022-12-28 08:30:22 -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	b0127428c6	Review suggestions.	2022-12-27 00:04:46 -03:00
Eduardo Quezada	701179eb1f	Documented missing use of SPRITE_ARR_ID_MOVE_SELECTOR1	2022-12-26 21:05:18 -03:00
Eduardo Quezada D'Ottone	263ed33755	Fixed Eggs sometimes reading garbage graphic data.	2022-12-26 11:56:27 -03:00
Eduardo Quezada D'Ottone	034ba7d5d2	Fixed usage of gBattleStruct->changedSpecies so its only used by player's party	2022-12-26 08:59:37 -03:00
SphericalIce	09d20bd634	Rename ball_display_unused_extra	2022-12-26 11:30:12 +00: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	9972cce0ec	Updated MOVE_EFFECT_DIRE_CLAW	2022-12-21 20:05:10 -03:00
SonikkuA-DatH	c4db74460a	Update battle_util.c ... Noted Protection Bypassing	2022-12-21 14:50:06 -08: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
LOuroboros	c40e15f8c5	Added Sheer Force check to Anger Shell	2022-12-21 19:43:41 -03:00
Eduardo Quezada D'Ottone	da535fc8f1	Merge pull request #2530 from mrgriffin/rhh-setroost-cleanup ... Minor Roost fixes/cleanup	2022-12-21 17:04:14 -03:00
Eduardo Quezada	339d794324	Fixed compile and made table into struct	2022-12-21 16:46:32 -03:00
ghoulslash	dba1aa4f0b	fix ai helping hand	2022-12-21 12:05:38 -05: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
Eduardo Quezada D'Ottone	42d2bee519	Merge pull request #2527 from mrgriffin/rhh-cleanup-handle-terrain-move ... Cleanup HandleTerrainMove	2022-12-21 12:21:46 -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	405a42b246	Update battle_anim_effects_1.c ... spacing	2022-12-20 18:17:49 -08:00
SonikkuA-DatH	8d28d23e74	Update src/battle_util.c ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-12-20 18:09:15 -08:00
Philipp AUER	766c0140ee	Refactor sInverseTypeEffectivenessTable to implicit lookup (#2528) ... * [refactor, battle_util] replace sInverseTypeEffectivenessTable LUT by implicit lookup * [review, style, squashme] update switch/case codestyle Co-authored-by: LOuroboros <lunosouroboros@gmail.com> * [review, squashme] merge code branches Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com> Co-authored-by: sbird <sbird@no.tld> Co-authored-by: LOuroboros <lunosouroboros@gmail.com> Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-12-20 22:48:41 -03:00
Martin Griffin	682c59869b	Cleanup HandleTerrainMove	2022-12-20 21:28:54 +00: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	07a91b9e9b	Update src/battle_script_commands.c ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2022-12-19 17:18:43 -08:00
SonikkuA-DatH	459631eb96	Update src/battle_script_commands.c ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2022-12-19 17:18:23 -08:00
SonikkuA-DatH	6215d4b1b4	Update src/battle_script_commands.c ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2022-12-19 17:18:05 -08: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	bf1a205661	Update src/battle_script_commands.c ... Bracket fixing Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2022-12-18 22:27:12 -08:00
SonikkuA-DatH	c81b702a86	Update src/battle_script_commands.c ... Spacing refix Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2022-12-18 22:26:51 -08:00
SonikkuA-DatH	03b5d36249	Update src/battle_script_commands.c ... removes various description Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2022-12-18 22:26:06 -08:00
SonikkuA-DatH	6a2a026c70	Update battle_anim.h ... Added required tags	2022-12-18 22:23:51 -08:00
SonikkuA-DatH	5682247ace	Add files via upload ... Base upload. Need to apply Teatime changes...	2022-12-18 19:14:54 -08:00
SonikkuA-DatH	b97a68656c	Delete battle_anim.h ... Need to replace with current...	2022-12-18 19:14:01 -08:00
SonikkuA-DatH	f0aee1f8d3	Merge branch 'upcoming' into SonikkuA-DatH-Teatime2	2022-12-18 17:50:39 -08:00
SonikkuA-DatH	44b522fd1c	Update battle_script_commands.c ... Spacing	2022-12-18 15:53:07 -08:00
SphericalIce	17052d4547	Use the ITEM_NONE constant for the registeredItem save block field	2022-12-18 21:05:37 +00:00
Eduardo Quezada	bd7d949f5f	Fixed B_DOUBLE_WILD_CHANCE becoming 1% less than what's set	2022-12-18 13:49:02 -03:00
LOuroboros	089104cd9c	Update battle_script_commands.c	2022-12-18 10:35:58 -03:00
Eduardo Quezada	66d1c9bc65	Documenting padding in structs used by Saveblocks	2022-12-17 22:55:43 -03:00
LOuroboros	4f951b7887	Updated ENDTURN_PLASMA_FISTS	2022-12-17 03:44:19 -03:00
Eduardo Quezada	c03f354dca	Finished cleaning up the animations to the new standard	2022-12-16 20:58:41 -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
Eduardo Quezada D'Ottone	0dca5a5230	Merge pull request #2516 from LOuroboros/patch-1 ... Updated SetMoveEffect	2022-12-15 18:10:08 -03: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	7c447a1f62	Small corrections	2022-12-14 12:09:16 -03:00
LOuroboros	4c9446ed0a	Fixed Speed Swap's effect	2022-12-14 12:00:45 -03:00
LOuroboros	af6ea91e72	Applied Eduardo's suggestion	2022-12-14 10:48:12 -03:00
LOuroboros	37151e4a2d	Updated SetMoveEffect	2022-12-14 10:46:11 -03:00
LOuroboros	a3e58b05c1	Implemented Guard Dog's effect	2022-12-12 20:33:37 -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
ghoulslash	340278c83b	Merge pull request #2452 from LOuroboros/intimidate ... Optimized Intimidate's code	2022-12-11 22:04:16 -05:00
Bassoonian	07a8af5975	Set FLAG_SYS_POKEMON_GET when debug gifting yourself a Pokémon	2022-12-11 22:09:23 +01:00
ghoulslash	e3e0d60222	Merge pull request #2467 from Bassoonian/gen9moves ... Generation IX Moves	2022-12-11 14:47:47 -05:00
Eduardo Quezada	2f96344cd9	Removed ANIM_CMD macro from unused_anims.h	2022-12-10 11:46:41 -03:00
LOuroboros	0d1f9d9613	Reimplemented Mimicry	2022-12-09 20:46:18 -03:00
ghoulslash	04e9c181ad	add covert cloak check for stats	2022-12-06 12:42:01 -05:00
ghoulslash	2391150274	Revert "CreateAbilityPopup always records ability" ... This reverts commit c8661a1bc1.	2022-12-06 11:25:27 -05:00
ghoulslash	c8661a1bc1	CreateAbilityPopup always records ability	2022-12-06 11:24:04 -05:00
ghoulslash	c327655ef5	small fixes	2022-12-06 11:12:20 -05:00
ghoulslash	5a26a69ccd	add some RecordItemEffect and RecordAbilityBattle situations, ai checks	2022-12-06 11:00:57 -05:00
ghoulslash	bdb480765c	add ability shield check to mummy, wandering spirit	2022-12-06 10:50:33 -05:00
ghoulslash	b6258adc6d	fix ShouldLowerStat clear amulet check	2022-12-06 10:43:01 -05:00
ghoulslash	6d28882e44	start gen9 hold effects	2022-12-06 09:48:36 -05:00
LOuroboros	c287f4f016	Updated sAbilitiesAffectedByMoldBreaker	2022-12-06 06:22:02 -03: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	fa78e3b2c4	Implemented Armor Tail's effect	2022-12-06 05:26:30 -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	18c30be838	Implemented Hadron Engine's effect	2022-12-06 05:23:30 -03:00
LOuroboros	dd90ab1911	Implemented Orichalcum Pulse's effect	2022-12-06 05:23:29 -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	c1e232cbf6	Implemented Rocky Payload'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
Eduardo Quezada D'Ottone	3718f58a0a	Merge pull request #2469 from LOuroboros/patch-1 ... Updated TryChangeBattleTerrain	2022-12-05 23:40:52 -03:00
LOuroboros	f9458117ee	Updated TryChangeBattleTerrain	2022-12-05 23:31:41 -03:00
Eduardo Quezada	2d694a84e3	Trying to fix remote reference	2022-12-05 21:57:28 -03:00
Bassoonian	8c77ae59d6	Use official Double Shock message	2022-12-04 21:57:02 +01:00
Bassoonian	06ab4fc842	Update move flags	2022-12-04 21:56:40 +01:00
Bassoonian	b0ead44ee8	Update battle_tv.c	2022-12-04 21:23:45 +01:00
Bassoonian	5bcb6b8afd	Update B_METRONOME_MOVES	2022-12-04 18:16:15 +01:00
Bassoonian	dc97a31c31	Change battle_debug.c to MOVES_COUNT	2022-12-04 18:15:35 +01:00
Bassoonian	c14fa82f43	Fix Headlong Rush description	2022-12-04 18:14:27 +01:00
Bassoonian	051ad7bf69	Update src/data/text/move_descriptions.h ... Co-Authored-By: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-12-04 00:26:05 +01:00
GriffinR	f55443656f	Add NUM_TILES_PER_METATILE	2022-12-03 17:29:02 -05:00
LOuroboros	eb082cd1a2	Implemented Purifying Salt's effect	2022-12-03 01:51:11 -03:00
LOuroboros	acb9c31bd4	Implemented Anger Shell's effect	2022-12-03 01:19:24 -03:00
LOuroboros	be71c4ca99	Implemented Thermal Exchange's effect	2022-12-03 01:15:31 -03:00
LOuroboros	b0027cb78b	Implemented Seed Sower's effect	2022-12-02 23:31:41 -03:00
LOuroboros	8dd3fd025f	Implemented Lingering Aroma's effect ... And took the chance to tweak Mummy's.	2022-12-02 23:31:38 -03:00
LOuroboros	653364fd71	Added the basic data for the Gen. 9 Abilities	2022-12-02 23:01:22 -03:00
ghoulslash	6140cacbef	set BS_SCRIPING before BattleScript_TrainerSlideMsgRet	2022-11-29 18:28:33 -05: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	4b799f2571	optimize BS_GetBattlerSide	2022-11-28 15:10:42 -05:00
ghoulslash	cd7abea6fe	fix BS_TrySymbiosis	2022-11-28 14:47:56 -05:00
ghoulslash	34ba9b4e0d	convert a few various to callnatives	2022-11-28 14:36:19 -05:00
ghoulslash	b869b836cc	add callnative bs func, convert metal burst dmg calc	2022-11-28 10:34:27 -05:00
ghoulslash	1037613b0e	Merge pull request #2418 from LOuroboros/zPP ... Made Z-Moves unusable without PP	2022-11-28 09:52:28 -05:00
ghoulslash	ac30ebd5a4	Merge pull request #2453 from AsparagusEduardo/RHH/pr/cleanup/configShiny ... Refactored Shiny configs + cleanup	2022-11-28 09:51:39 -05:00
tustin2121	cf6f343726	Use multi-include incbins for stormy_water ... - Removes a special case rule from the make files.	2022-11-26 23:38:39 -05:00
LOuroboros	add75d84c0	Applied a couple of tweaks ... -Made it so only Rare Candies can evolve Lv100 'mons. Game Freak dumb. The Exp. Candies SHOULD work too. -Made sure to remove the candy that was used from the bag.	2022-11-25 18:12:51 -03:00
LOuroboros	53110a0ff6	Allow Lv100 'mons to access level based evos	2022-11-25 17:34:11 -03: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
GriffinR	004ce32da0	Sync text ctrl codes with pokefirered	2022-11-23 21:13:00 -05:00
Eduardo Quezada	7999220361	Fixed modern compile	2022-11-22 18:37:38 -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
Bassoonian	4ac1e4fc61	Power Shift is now a clone of Power Trick	2022-11-19 13:41:56 +01: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	4da9ecbcea	Prepare FLAG_SLICING_MOVE for merger with abilities branch	2022-11-18 22:37:31 +01:00
Bassoonian	4034f18c0e	Update PLA descriptions	2022-11-18 22:30:40 +01: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	a250341e6c	Forgot to reset Wicked Torque effect rate	2022-11-18 22:00:46 +01:00
Bassoonian	3ac3cb249e	Wicked Torque effect	2022-11-18 22:00:21 +01:00
Bassoonian	d4c92a0a19	Fix Bitter Malice's effect	2022-11-18 21:54:46 +01:00
Bassoonian	ed33f2b9ce	Change PLA moves to SV effects	2022-11-18 20:56:25 +01:00
Bassoonian	e279185152	Update move data to GEN9 (with config)	2022-11-18 12:22:15 +01:00
Bassoonian	f7d1a12d2d	Data entry for gen9 moves	2022-11-18 12:15:44 +01:00
GriffinR	df470b75dd	Merge pull request #1817 from GriffinRichards/sync-wireless ... Add cursor kind constants, sync wireless improvements	2022-11-17 15:18:20 -05: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
eatthepear	bd4b660983	Fix Berries that were broken after Bug Bite fix ... Issue #2448 Haven't tested extensively, but regular Berries work and Bug Bite w/ Berries also works. I believe this line was missing by accident (you can look at the merged Bug Bite PR #2433 to see that this line was deleted and never replaced).	2022-11-11 21:28:44 -05:00
LOuroboros	7260478c54	Uncommented level up moves	2022-11-11 01:31:22 -03:00
GriffinR	601bb0b578	Index gBattleFrontierHeldItems	2022-11-10 16:14:06 -05:00
GriffinR	3b1c8dfb17	Update list menu graphics	2022-11-09 19:44:58 -05: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
Eduardo Quezada	bd63ef18af	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 ... # Conflicts: # src/pokemon_storage_system.c	2022-11-09 19:33:26 -03:00
GriffinR	e434b0047f	More missing constant usage	2022-11-09 15:53:47 -05:00
GriffinR	431a7ef8dd	Add missing cursorKind field usage	2022-11-09 15:37:47 -05:00
GriffinR	1d1c2d41bb	Add list menu cursor constants	2022-11-09 15:16:46 -05:00
GriffinR	b3e75138da	Sync wireless improvements	2022-11-09 15:14:18 -05:00
LOuroboros	a35986fd9c	Fixed indentation in ScrCmd_faceplayer	2022-11-08 21:01:50 -03:00
LOuroboros	999a53028a	Updated AnimTask_PrimalReversion	2022-11-08 09:38:27 -03:00
Eduardo Quezada D'Ottone	e6ae0bd01e	Merge pull request #2434 from LOuroboros/badDreams ... Optimized Bad Dreams' code	2022-11-08 08:16:07 -03:00
tustin2121	33f3a7c11a	Adding FindObjectEventPaletteIndexByTag bugfix ... The code in event_object_movement.c indicates that OBJ_EVENT_PAL_TAG_NONE was meant to be a sentinel for the bottom of each of the tables involving palettes in there. sObjectEventSpritePalettes is the exception, but the functions that access it look for OBJ_EVENT_PAL_TAG_NONE even though it's not in the table. If the palette tag isn't in the table, the functions which scan it fall off the bottom of the table into an infinite loop of scanning 256 "entries" of the table (because it uses a u8 index), and the game locks up. In vanilla, the search simply never falls off the bottom of the table. It seems the developers intended for that last entry to be {NULL, OBJ_EVENT_PAL_TAG_NONE}.	2022-11-07 06:09:21 -05:00
Eduardo Quezada	237877e21b	Doc missing uses of ST_OAM_OBJ_X in Pokémon Storage System	2022-11-07 00:00:23 -03: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	0eccbdf980	Primal Reversion at the beginning of a battle now happens in the switchin ability loop, making it happen by speed order.	2022-11-06 00:36:25 -03:00
Eduardo Quezada	712d41c752	Cleaned up move effect checks for Dragon Tail/Circle Throw	2022-11-05 23:51:59 -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
BuffelSaft	bbd7b205fd	Merge pull request #2433 from ghoulslash/be/bug_bite ... Redo Bug Bite	2022-11-05 22:08:47 +13:00
LOuroboros	f56df74576	Optimized Bad Dreams' code ... Misc: -Made the ability pop up stick around until the ability's effect ends just like in ORAS. -Updated sText_BadDreamsDmg accordingly while I was at it.	2022-11-04 14:58:58 -03:00
Eduardo Quezada D'Ottone	fa8bf80905	Merge pull request #2420 from LOuroboros/teleport ... Updated CanTeleport	2022-11-04 12:40:25 -03:00
Eduardo Quezada D'Ottone	2b5aff2764	Merge pull request #2426 from tustin2121-2/patch-linker ... GF Header and Modern Builds	2022-11-04 12:27:13 -03: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
BuffelSaft	d05c74b9e9	Merge pull request #2430 from AsparagusEduardo/RHH/pr/fix/BadDreams ... Fixed Bad Dream's ability popup message	2022-11-05 03:42:44 +13:00
ghoulslash	7a0e541413	workaround for GetBattlerHoldEffectParam to handle bug bite different battler id	2022-11-04 10:29:05 -04:00
Eduardo Quezada	5b1552514e	Review changes	2022-11-04 11:10:06 -03: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	8c66b318eb	Fixed Bad Dream's ability popup message	2022-11-04 00:46:07 -03:00
Eduardo Quezada	d23b5c95c9	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/monAnimations ... # Conflicts: # src/data/pokemon_graphics/front_pic_anims.h # src/pokemon.c	2022-11-03 23:31:20 -03: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
tustin2121	b32413d11e	Restoring the GFHeader ... - Also adding comment about what the header does and how to maintain it.	2022-11-02 12:45:36 -04:00
tustin2121	fd87c97ef8	Adding documentation about GFHeader	2022-11-02 12:42:58 -04:00
Eduardo Quezada	271bff5675	Gen 5+ stat recalculate in the same party loop at the end of battle that changes forms.	2022-11-02 10:06:02 -03:00
Eduardo Quezada	8b0a848424	Zen Mode triggers at the beginning of a battle	2022-11-01 23:53:04 -03: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	fa8b1b9c05	Updated descriptions of form change constants	2022-11-01 15:02:45 -03:00
Eduardo Quezada	f5b900e2ef	Defaults Primal Reversion indicator to Alpha when item not Red Orb.	2022-11-01 15:02:22 -03:00
Eduardo Quezada	a57f6d184b	Fainting by poison in the overworld reverts forms	2022-11-01 12:24:04 -03:00
Eduardo Quezada D'Ottone	ebc9fc31d2	Merge pull request #2416 from DizzyEggg/fix_palace ... Fix battle palace bug	2022-11-01 12:16:55 -03:00
DizzyEggg	51d8b57dcc	restore deleted line	2022-10-31 13:19:10 +01:00
DizzyEggg	ea43b7732c	Fix battle tent again	2022-10-31 13:16:48 +01:00
Eduardo Quezada D'Ottone	9d64c838cf	Merge pull request #2424 from LOuroboros/getItemId ... Actually removed ItemId_GetId	2022-10-31 07:15:25 -03:00
LOuroboros	52dda5fc0f	Actually removed ItemId_GetId	2022-10-30 22:52:22 -03:00
LOuroboros	5ebc996c51	Removed worthless DEBUG_FLAG_PC_FROM_DEBUG_MENU config	2022-10-30 22:03:14 -03:00
Eduardo Quezada	14e85249d1	Review changes	2022-10-30 17:12:13 -03:00
Eduardo Quezada	d02fc43703	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030	2022-10-30 13:38:25 -03:00
GriffinR	d90132842a	Update gitignore/spacing for new region map data	2022-10-30 12:22:41 -04: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
Eduardo Quezada	3172273c73	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/Lures ... # Conflicts: # src/pokemon.c	2022-10-30 12:16:09 -03:00
GriffinR	c76beed989	Merge pull request #1807 from pret/porymap-5 ... Update for Porymap 5.0.0	2022-10-30 11:01:37 -04:00
LOuroboros	a74a8fa134	Updated CanTeleport	2022-10-29 16:13:40 -03:00
LOuroboros	bdd082f869	Made Z-Moves unusable without PP	2022-10-29 12:07:59 -03:00
DizzyEggg	215604f5f7	fix battle palace bug	2022-10-27 20:44:43 +02:00
Eduardo Quezada	85c0d2dac8	Review changes	2022-10-27 11:26:09 -03:00
BuffelSaft	224ca256ce	Requested clean up ... Rename constants, remove white space, improve B_BEAT_UP description. * Rename B_BEAT_UP_DMG to B_BEAT_UP * Shorten B_PARENTAL_BOND_DAMAGE to B_PARENTAL_BOND_DMG * Remove trailing whitespace * Replace boolean 1 with TRUE in MOVEEND_MULTIHIT_MOVE	2022-10-27 22:25:33 +13:00
Eduardo Quezada D'Ottone	93dd8786ee	Merge pull request #2413 from kaisermg5/fix_tmhm_lock ... Fix lock when teaching a TM/HM after learning a move by level up.	2022-10-26 22:27:19 -03:00
kaisermg5	2cd0a0f862	Fix lock when teaching a TM/HM after learning a move by level up.	2022-10-25 18:48:06 -03:00
Eduardo Quezada	85ce30b1d6	Created macros for Bard Sounds	2022-10-25 14:33:02 -03:00
Eduardo Quezada	3ed485632f	Renamed gBaseStats to gSpeciesInfo	2022-10-24 17:01:48 -03:00
BuffelSaft	d9cc98a4fe	Suggested changes ... - Various style fixes - Add BATTLE_ALIVE_EXCEPT_ATTACKER case to CountAliveMonsInBattle	2022-10-24 22:19:35 +13:00
BuffelSaft	7bca475d77	Add Misty Explosion to Parental Bond ban list ... Probably not needed, but just in case!	2022-10-23 21:48:20 +13:00
BuffelSaft	9b076a9dcf	Fix spread moves, tidy up CANCELLER_MULTIHIT_MOVES ... - Parental Bond spread moves should now strike twice whenever there is a single target, even if the target is the user's ally. - Random chance to hit 2-5 times is now set in SetRandomMultiHitCounter().	2022-10-23 21:40:04 +13:00
BuffelSaft	1b056f9044	Fix various Parental Bond issues ... - Dragon Tail and Circle Throw strike twice and then switch the target - Z moves are unaffected by Parental Bond - Renamed parentalBondOn to parentalBondState - Added constants for possible values of parentalBondState - Fixed broken stat change animations and removed unused MOVE_EFFECT_SKY_DROP	2022-10-23 17:37:23 +13:00
LOuroboros	c267c615c1	Fixed CanFling	2022-10-22 10:38:39 -03:00
BuffelSaft	6035c5a280	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald into multistrike	2022-10-22 14:31:13 +13:00
Eduardo Quezada	0a79390ec0	Primal Reversion in Form Change tables	2022-10-21 02:08:37 -03:00
Eduardo Quezada	861590f747	Form change when fainting. Goodbye UndoFormChange!	2022-10-20 18:53:12 -03:00
Eduardo Quezada	d8cc7f7abe	Form change when switching out	2022-10-20 17:56:56 -03:00
Eduardo Quezada	b74f0777da	Renamed form change constants	2022-10-20 17:22:58 -03:00
Eduardo Quezada	ff494edb85	Refactored ItemUseOutOfBattle_FormChange to not use secondaryId	2022-10-20 16:57:34 -03:00
Eduardo Quezada	620e69945d	Form change for starting and ending battles. Adjusted PP for Iron Head/Behemoth moves	2022-10-20 16:40:24 -03:00
GriffinR	e752c8a2f9	Merge pull request #1805 from tustin2121/tustin2121-patch-runimmedeately ... Document seldom-used trigger functionality	2022-10-20 11:45:35 -04:00
Eduardo Quezada D'Ottone	18e7fc5efc	Introduce NUM_BATTLE_SIDES	2022-10-20 08:41:18 -03:00
GriffinR	3e8baa5b04	Merge branch 'master' into porymap-5	2022-10-18 22:54:25 -04:00
GriffinR	a418f8d976	Merge pull request #1755 from GriffinRichards/map-dynamic ... Rename special map constants, treat warp ids as strings	2022-10-18 22:45:56 -04:00
tustin2121	4730870646	VAR_RUN_TRIGGER_IMMEDIATELY -> TRIGGER_RUN_IMMEDIATELY ... Getting rid of the VAR_ prefix, to avoid the porymap problem.	2022-10-18 21:12:31 -04:00
GriffinR	e33581ff9c	Merge pull request #1671 from sphericalice/heal-location-none ... Add the HEAL_LOCATION_NONE constant	2022-10-18 18:41:04 -04:00
Abaresk	7f09894045	Merge branch 'master' into thunder	2022-10-18 04:37:56 +00:00
Marcus Huderle	0d0a9bd31d	Update src/overworld.c ... Co-authored-by: GriffinR <griffin.g.richards@gmail.com>	2022-10-17 17:41:27 -07:00
Marcus Huderle	48ab684b48	Fix weather color map documentation	2022-10-17 17:41:27 -07:00
GriffinR	716025395c	Merge pull request #1802 from abaresk/wild-encounters ... Document new metatile wild encounter odds	2022-10-17 18:56:58 -04:00
Eduardo Quezada D'Ottone	c57ab9e529	Merge pull request #2392 from gruxor/wait-fix ... Replaced busy-wait loops	2022-10-17 15:34:22 -03:00
gruxor	610a8efb7d	Replaced busy-wait loops	2022-10-17 11:21:06 -04:00
tustin2121	327c648e87	Document seldom-used trigger functionality ... Added a define for use in overworld triggers where the goal is to run the provided script in the immediate script context instead of the global one like normal. This is used in triggers in the desert, on faraway island, and a couple other places to do weather effects quickly and on the same frame. Suggestions for a better define name are welcome.	2022-10-16 20:46:50 -04:00
Eduardo Quezada D'Ottone	1607291982	Implemented Honey's Sweet Scent functionality	2022-10-16 20:20:13 -03:00
ghoulslash	ede6162724	Merge pull request #2388 from AsparagusEduardo/RHH/pr/running ... Config for running indoors	2022-10-16 09:28:32 -04:00
Eduardo Quezada D'Ottone	dd2d6107bd	Fixed Z-Move not being cleared if Pokémon faints	2022-10-16 09:57:21 -03:00
Abaresk	e67d55bfc4	Fix names	2022-10-15 13:37:24 +00:00
Abaresk	b538239f18	Add more documentation to thunder weather	2022-10-15 04:25:35 +00:00
Eduardo Quezada D'Ottone	4cbc6d4de1	Config for running indoors	2022-10-14 22:31:45 -03:00
LOuroboros	8a1a561b80	Uncommented evo moves for each species	2022-10-14 11:28:15 -03:00
ghoulslash	d64e18d0b4	Merge pull request #2385 from LOuroboros/trainerClassBasedBalls ... Added class-based Poké Balls for trainers	2022-10-14 10:19:20 -04:00
LOuroboros	90f79999bb	Added class-based Poké Balls for trainers ... Thanks to Ghoulslash for helping me optimizing things.	2022-10-14 11:14:30 -03:00
GriffinR	2e128e3282	Merge pull request #1799 from AsparagusEduardo/pret/pr/recordedInvalid ... Moved ILLEGAL_BATTLE_TYPES to include\constants\battle.h and renamed it to BATTLE_TYPE_RECORDED_INVALID	2022-10-13 14:30:18 -04:00
GriffinR	722e501b7c	Merge pull request #1800 from AsparagusEduardo/pret/pr/gSoftResetDisabled ... Documented missing gSoftResetDisabled uses	2022-10-13 14:29:43 -04:00
Eduardo Quezada D'Ottone	71dad6aec9	Merge pull request #2384 from May8th1995/confuseAI ... Fix AI issue giving decrementing score to confuse hit instead of confuse	2022-10-13 12:16:00 -03:00
tennis	db013aab0b	Fix AI issue giving decrementing score to confuse hit instead of confuse	2022-10-13 15:58:57 +01:00
tennis	f79205af08	Fix bug where badge boost flag is inverted	2022-10-13 15:32:08 +01:00
Abaresk	af081b08ee	Make related func names more concise	2022-10-12 04:35:23 +00:00
Abaresk	11e3f03bd8	Document new metatile wild encounter odds	2022-10-12 04:03:02 +00:00
GriffinR	60e1ad20e4	Add NUM_MON_PIC_FRAMES, and trainer pic size constants	2022-10-10 23:16:08 -04:00
Kurausukun	dc97eca92d	combine "unused" field into tile buffer	2022-10-10 21:00:31 -04:00
GriffinR	bd023b1c6c	Merge pull request #1796 from GriffinRichards/tilesets-c ... Convert tilesets.s to C	2022-10-10 12:47:47 -04:00
GriffinR	65d3944a93	Give tileset palettes proper type, name compressed secret base tiles	2022-10-08 02:02:12 -04:00
Eduardo Quezada D'Ottone	2ce340e8e1	Merge pull request #2262 from LOuroboros/becomingAHero ... Fixed Mega Evolved Pokémon being able to get Friendship effects in battle	2022-10-07 18:27:29 -03:00
LOuroboros	589c969e89	Removed unused access to struct MegaEvolutionData in GetBattlerFriendshipScore	2022-10-07 18:20:00 -03:00
ghoulslash	06bddbac23	Merge pull request #2379 from AsparagusEduardo/RHH/pr/pretmerge_20221007 ... One for the go! (pret merge 2022/10/07)	2022-10-07 17:14:00 -04:00
ghoulslash	9164f03f96	Merge pull request #2141 from Sneed69/Triple-Kick-Fix ... Triple kick power calc rework	2022-10-07 16:31:50 -04:00
Eduardo Quezada	044898fe95	Documented missing gSoftResetDisabled uses	2022-10-07 15:56:00 -03:00
Eduardo Quezada	453da8aa8c	Moved ILLEGAL_BATTLE_TYPES to include\constants\battle.h and renamed it to BATTLE_TYPE_RECORDED_INVALID	2022-10-07 15:49:00 -03:00
Eduardo Quezada	77f24d42e4	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/reworkScald ... # Conflicts: # include/constants/battle_config.h	2022-10-07 15:39:02 -03:00
Eduardo Quezada	44754f8ca7	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2 ... # Conflicts: # include/constants/pokemon_config.h # src/data/pokemon_graphics/back_pic_table.h # src/data/pokemon_graphics/palette_table.h # src/data/pokemon_graphics/shiny_palette_table.h # src/pokemon_icon.c	2022-10-07 15:27:16 -03:00
Eduardo Quezada	2a8048b677	Removed ItemId_GetId like in upstream	2022-10-07 14:53:58 -03:00
Eduardo Quezada	68b474c0f0	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20221007 ... # Conflicts: # include/constants/items.h # src/battle_interface.c	2022-10-07 14:52:32 -03:00
Eduardo Quezada	9b977486fe	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/pokemonConfig ... # Conflicts: # src/data/pokemon/base_stats.h	2022-10-07 14:05:45 -03:00
LOuroboros	50ca188cb2	Replaced didMegaEvo with a shiny new species flag	2022-10-07 12:32:36 -03:00
LOuroboros	02c6bc64b2	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into becomingAHero	2022-10-07 12:20:52 -03:00
ghoulslash	441586f23f	Merge pull request #2293 from AsparagusEduardo/RHH/pr/pokemonFlags ... 4 new species flags	2022-10-07 10:55:43 -04:00
ghoulslash	d7f7fa7d07	Merge pull request #2376 from AsparagusEduardo/RHH/pr/feature/ballsMulti ... Changed ballMultiplier to account for future Hisuian ball multipliers	2022-10-07 10:48:02 -04:00
ghoulslash	1e04c80dfa	Merge pull request #2367 from AsparagusEduardo/RHH/pr/feature/MewTeach ... Special handling for Mew's Teachable moveset	2022-10-07 10:39:56 -04:00
ghoulslash	7c7eb8ac7f	Merge pull request #2365 from AsparagusEduardo/RHH/pr/BattleArenaBide ... Added missing Bide exception to Battle Arena Mind Points	2022-10-07 10:32:47 -04:00
ghoulslash	923046c993	Merge pull request #2359 from AsparagusEduardo/RHH/pr/pretmerge_20220925 ... I don't have any Sunday memes (pret merge 2022-09-25)	2022-10-07 10:25:59 -04:00
GriffinR	bb2e64b3fc	Merge pull request #1786 from tustin2121/patch-spritestuff ... Subsprite Tables Documentation	2022-10-06 22:17:32 -04:00
tustin2121	ea168d1a6b	Fix typo 2: revelations	2022-10-06 20:34:46 -04:00
tustin2121	f3bddd1ea6	Fix typo	2022-10-06 19:36:01 -04:00
GriffinR	e293986fbb	Merge pull request #1793 from GriffinRichards/clean-shop ... Clean up shop.c	2022-10-06 17:24:53 -04:00
GriffinR	c6e4c29ea3	Merge pull request #1792 from GriffinRichards/display-tiles ... Add DISPLAY_TILE_* constants	2022-10-05 20:44:28 -04:00
Eduardo Quezada	a20334f79a	Removed unused functions in item header	2022-10-04 22:06:07 -03:00
Eduardo Quezada	e8ed0bd9f2	Changed ballMultiplier to account for future Hisuian ball multipliers	2022-10-04 20:39:45 -03:00
Eduardo Quezada D'Ottone	d0895a7c32	Merge pull request #2370 from StephenLynx/master ... Fixed berserk not activating if mon falls to exactly half HP.	2022-10-01 21:30:44 -03:00
Sérgio Augusto Vianna	764bed6580	Fixed berserk not activating if mon falls to exactly half HP.	2022-10-01 20:50:55 -03:00
Eduardo Quezada D'Ottone	af171eb4d4	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925 ... # Conflicts: # src/pokemon_summary_screen.c	2022-10-01 17:32:32 -03:00
GriffinR	e989879f71	Use window constants in battle_dome	2022-09-29 22:17:44 -04:00
GriffinR	7587963d24	Use window constants in berry_fix_program	2022-09-29 19:09:50 -04:00
GriffinR	7449525428	Use window constants in wallclock	2022-09-29 18:56:34 -04:00
GriffinR	77c3163cf0	Use window constants in reset_rtc_screen	2022-09-29 18:29:20 -04:00
GriffinR	7d4fddd56b	Use window constants in mystery_event_menu	2022-09-29 15:55:26 -04:00
GriffinR	fb87616e9d	Use window constants in mystery_gift_menu	2022-09-29 15:48:19 -04:00
GriffinR	79a34411ce	Add additional DISPLAY_TILE_WIDTH usage	2022-09-29 15:22:21 -04:00
GriffinR	5af7355fbd	Clarify window ID usage in contest_util	2022-09-29 15:10:32 -04:00
GriffinR	6bc1955c99	Use window constants in easy_chat	2022-09-29 15:03:44 -04:00
GriffinR	c719d5d9b1	Use window constants in link	2022-09-29 14:50:51 -04:00
GriffinR	9ae918bb35	Use window constants in field_region_map	2022-09-29 13:37:32 -04:00
GriffinR	2cd07d80b8	Use window constants in wireless_communication_status_screen	2022-09-29 13:31:01 -04:00
GriffinR	81defb5986	Use window constants in union_room_chat	2022-09-29 13:20:35 -04:00
GriffinR	4af1044439	Use window constants in region_map	2022-09-29 13:11:38 -04:00
GriffinR	1f225286d5	Use window constants in party_menu	2022-09-29 12:55:31 -04:00
GriffinR	9f5704b05a	Use window constants in trainer_card	2022-09-29 12:30:10 -04:00
GriffinR	dd5daa3208	Use window constants in berry_blender	2022-09-29 12:15:17 -04:00
GriffinR	16be1e8447	Use window constants for move relearner	2022-09-29 12:10:10 -04:00
sbird	8dad7cc649	[doc] clean up casts in decompress.c	2022-09-29 17:33:39 +02:00
GriffinR	f254df9a1a	Use window constants in berry_tag_screen	2022-09-29 11:28:27 -04:00
Eduardo Quezada	90ad11278d	Sorry Mewtwo ^^;	2022-09-28 09:17:10 -03:00
Eduardo Quezada	d24899369f	Special handling for Mew's Teachable moveset	2022-09-28 09:04:31 -03:00
GriffinR	6db489e2d5	Use constants for overworld object palette slots	2022-09-27 20:16:48 -04:00
GriffinR	4f407a1066	Convert tilesets.s to C	2022-09-27 17:23:26 -04:00
Eduardo Quezada	ecad6ff0db	Merge remote-tracking branch 'RHH_origin/breaking' into RHH/pr/breaking/palleteConversion2	2022-09-27 10:46:49 -03:00
Eduardo Quezada	fb9105f8ac	Added Mega Evolution flag	2022-09-27 10:21:26 -03:00
Eduardo Quezada	3d214f8204	Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/pokemonFlags ... # Conflicts: # src/pokemon.c	2022-09-27 10:13:32 -03:00
Eduardo Quezada	5ca1b927e6	Added missing Bide exception to Battle Arena Mind Points	2022-09-27 08:13:32 -03:00
ghoulslash	253234378c	trace records target ability	2022-09-26 23:46:41 -04:00
ghoulslash	6e276b5f4d	Merge pull request #2339 from AsparagusEduardo/RHH/pr/MindRatings ... Extrapolated Battle Arena's move Mind ratings	2022-09-26 21:04:16 -04:00
Eduardo Quezada	ae21e1626e	Reworked Mind Points	2022-09-26 21:20:08 -03:00
GriffinR	e515e52abb	Add DISPLAY_TILE_* constants	2022-09-26 19:52:17 -04:00
ghoulslash	ff42806e04	Merge pull request #2335 from AsparagusEduardo/RHH/pr/MultiBattleFix ... Multi battle interface fix	2022-09-26 09:12:40 -04:00
ghoulslash	8ecdf68491	Merge pull request #2360 from TheXaman/rhh_pokemon_debug_fix ... Fixes: Pokémon Debug isn't loading female icon palettes correctly	2022-09-26 09:09:14 -04:00
Eduardo Quezada	dfdfb72365	Separate config for updated move types	2022-09-26 07:50:43 -03:00
TheXaman	886a487bf1	Added LoadMonIconPalettePersonality to load gender specific pokemon icon palettes	2022-09-26 12:40:30 +02:00
GriffinR	f0744641d1	Merge pull request #1651 from garakmon/entry_json ... use json for region map sections	2022-09-25 21:56:09 -04:00
GriffinR	171367d66c	Merge pull request #1643 from cbt6/object-event-graphics-info ... Format object event graphics info	2022-09-25 21:55:22 -04:00
GriffinR	45e6b48170	Merge pull request #1636 from GriffinRichards/rme-update ... Updates to region map for Porymap	2022-09-25 21:54:26 -04:00
Eduardo Quezada	5054cf3586	Documented unk40EF in Summary Screen	2022-09-25 21:33:20 -03:00
GriffinR	56c28fb2dd	Move region map gitignore to existing data gitignore	2022-09-25 18:15:16 -04:00
GriffinR	e473aaf783	Merge branch 'master' of https://github.com/pret/pokeemerald into entry_json	2022-09-25 18:10:04 -04:00
Eduardo Quezada	057f76bfe6	Cleaned up missing JOY macros	2022-09-25 13:05:18 -03:00
GriffinR	7223dbd62f	Merge branch 'master' into rme-update	2022-09-25 11:56:57 -04:00
Eduardo Quezada	f969effd36	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925	2022-09-25 12:51:39 -03:00
Eduardo Quezada D'Ottone	3b983aae14	Apply suggestions from code review	2022-09-25 08:31:24 -03:00
LOuroboros	a9ab3286ef	Fixed IsPlayerInFrontOfPC	2022-09-25 05:51:08 -03:00
Eduardo Quezada	0f35f080ec	Gender icon in naming screen based on Pokémon name length	2022-09-24 23:48:24 -03:00
LOuroboros	8e9bfda120	Update field_specials.c	2022-09-24 22:22:18 -03:00
Eduardo Quezada D'Ottone	13573b6e53	Merge pull request #2356 from LOuroboros/PeeC ... Modified the debug menu's PC access	2022-09-24 22:18:21 -03:00
LOuroboros	00eb67608a	Small tweak to the new check in PCTurnOffEffect	2022-09-24 22:10:46 -03:00
LOuroboros	5500e64a71	Reworked the debug menu's PC access	2022-09-24 17:26:41 -03:00
Eduardo Quezada D'Ottone	17c8842ad4	Merge branch 'dev' into teleport	2022-09-24 14:39:21 -03:00
Eduardo Quezada D'Ottone	38df216ebd	Merge pull request #2355 from ghoulslash/be/aiparty ... Add overwrittenAbilities field	2022-09-24 14:33:02 -03:00
Eduardo Quezada D'Ottone	0fa8e20d08	Style changes from upstream	2022-09-24 14:20:07 -03:00
ghoulslash	c22671d2a2	add overwrittenAbilities field	2022-09-24 12:12:31 -04:00
Eduardo Quezada D'Ottone	a483899043	Merge branch 'dev' into symbiosis	2022-09-24 11:58:35 -03:00
Eduardo Quezada D'Ottone	d59d8b92af	Merge branch 'dev' into AI	2022-09-24 11:07:09 -03:00
Eduardo Quezada D'Ottone	bb564d805f	Merge pull request #2353 from LOuroboros/siTypes ... Fixed Z-Moves showing the wrong type in battle	2022-09-24 10:36:38 -03:00
LOuroboros	696d90880e	Made Z-Moves always show the right type	2022-09-24 09:33:31 -03:00
LOuroboros	64405250ae	Updated IsViableZMove	2022-09-24 08:50:48 -03:00
GriffinR	9b6b164aad	Merge pull request #1768 from SBird1337/feature/mgba-print ... [debug] add support for mgba printf	2022-09-23 13:49:48 -04:00
sbird	343d7f7d26	[debug] do not use heap allocation for MgbaPrintf	2022-09-23 04:12:57 +02:00
Eduardo Quezada	7e112b0f0d	Added missing uses of JOY_xx macros	2022-09-22 21:43:33 -03:00
GriffinR	1107ff954d	Clean up shop.c	2022-09-22 15:08:17 -04:00
GriffinR	b8341558c3	Merge pull request #1779 from GriffinRichards/sync-fld-weather ... Add misc constant usage to field_weather_effect	2022-09-22 12:13:07 -04:00
GriffinR	9bcc36fe08	Merge pull request #1767 from GriffinRichards/trainer-pals ... Generate trainer pic palettes from image	2022-09-22 11:34:03 -04:00
StubbornOne	cad8922d7b	Replace battle-type flags in GetAiLogicData with BATTLE_TYPE_HAS_AI	2022-09-21 23:42:40 +08:00
LOuroboros	d04a852e91	Update debug.c	2022-09-20 02:31:20 -03:00
Eduardo Quezada D'Ottone	24aebf0624	Merge pull request #2337 from LOuroboros/patch-2 ... Renamed some misclassified labels in src/debug.c	2022-09-19 14:33:51 -03:00
Eduardo Quezada D'Ottone	6868d8aa2a	Merge pull request #2338 from LOuroboros/BoxMonMon ... Fixed typo in BoxMonKnowsMove	2022-09-19 14:33:12 -03:00
Eduardo Quezada	192312d7ee	Extrapolated Battle Arena's move Mind ratings	2022-09-19 14:29:22 -03:00
LOuroboros	5f67335212	Fixed typo in BoxMonKnowsMove	2022-09-19 05:21:54 -03:00
LOuroboros	c137b01dd8	Update debug.c	2022-09-19 04:19:19 -03:00
ghoulslash	add3625589	fix natural cure, shed skin, early bird check in ShouldSwitchIfGameStatePrompt	2022-09-18 22:47:30 -04:00
Eduardo Quezada	adb4e54e95	Fixed multi battle battler coordinates and party menu when only one Pokémon is chosen	2022-09-18 22:34:06 -03:00
Eduardo Quezada D'Ottone	681ad8c7a9	Merge remote-tracking branch 'RHH_origin/dev_1.x' into RHH/pr/pokemonConfig ... # Conflicts: # src/data/pokemon/form_change_table_pointers.h # src/data/pokemon/form_change_tables.h # src/data/pokemon/form_species_table_pointers.h # src/data/pokemon_graphics/back_pic_coordinates.h # src/data/pokemon_graphics/front_pic_coordinates.h	2022-09-18 18:25:05 -03:00
Eduardo Quezada D'Ottone	41ae8ecdb7	Update src/battle_controller_opponent.c	2022-09-18 00:51:34 -03:00
Eduardo Quezada D'Ottone	293a880238	Apply suggestions from code review	2022-09-18 00:50:21 -03:00
Ct11217	5f74781a7d	Remove ACE_POKEMON_FUNCTIONALITY	2022-09-17 17:44:50 -06:00
tustin2121	5c55e44173	More diagrams ... - Diagramed all subsprite tables in the code base. There's a LOT in the slot machine code.	2022-09-17 14:34:20 -04:00
tustin2121	c371a44a83	Formatting	2022-09-17 13:34:54 -04:00
tustin2121	13877f71dc	Minor documentation ... Some things I figured out while working on my hack. - The Subsprite tables do not use `DISPLAY_WIDTH`, but rather use -16, since they are signed bytes. The negative numbers better illustrate what the tables are doing. - Figured out the as-of-yet undocumented data in SpriteCB_FlygonSilhouette	2022-09-17 13:33:10 -04:00
Eduardo Quezada	8a68596b64	Removed free macro	2022-09-16 20:36:44 -03:00
Eduardo Quezada	e412ec30a0	Removed calloc macro	2022-09-16 20:34:22 -03:00
Eduardo Quezada	63156b4398	Removed malloc macro	2022-09-16 20:24:26 -03:00
Eduardo Quezada	b2b308fe9e	Fixed Old Rod Lure swap	2022-09-16 15:16:51 -03:00
Eduardo Quezada	b0bd5f9879	Cleaned up trailing spaces and spaces instead of tabs	2022-09-16 14:42:11 -03:00
Eduardo Quezada	720cb249d6	Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/reworkScald ... # Conflicts: # include/constants/battle_config.h	2022-09-16 12:06:06 -03:00
ghoulslash	8bbe1b9037	Merge pull request #2327 from AsparagusEduardo/RHH/pr/Metronome ... Config to limit the moves called by Metronome (by generation)	2022-09-16 11:03:33 -04:00
Eduardo Quezada	6b79c7772c	Merge branch 'RHH/dev' into RHH/pr/pretmerge_20220909 ... # Conflicts: # src/battle_interface.c	2022-09-16 11:56:50 -03:00
Eduardo Quezada	672f572ff8	Config to limit the moves called by Metronome (by generation)	2022-09-16 11:04:30 -03:00
Eduardo Quezada	77696ca686	Rolled EFFECT_SCALD into EFFECT_BURN_HIT with a config for its Gen6+ change	2022-09-16 10:31:02 -03:00
Ct11217	cc4a9b9f4b	Recommit to Dev branch	2022-09-15 22:57:29 -06:00
ghoulslash	ed81ec41bc	Merge pull request #2324 from ghoulslash/be/aiswitch ... fix ai switch semi invulnerable	2022-09-15 23:15:02 -04:00
ghoulslash	95a3ead254	styling fix	2022-09-15 22:10:39 -04:00
Eduardo Quezada D'Ottone	7825153bb2	Merge pull request #2282 from AsparagusEduardo/RHH/pr/tutorFix ... Exp Candy Fixes	2022-09-15 22:46:59 -03:00
ghoulslash	20190ac85a	fix ai switch semi invulnerable	2022-09-15 18:34:15 -04:00
ghoulslash	133aa9e28d	Merge pull request #2306 from AsparagusEduardo/RHH/pr/autogenNames ... Generating music names for the debug menu based on their labels	2022-09-15 18:02:27 -04:00
ghoulslash	6616c89451	Merge pull request #2303 from Blackforest92/RHH-PR-Branch ... Tidying graphics - Trio Weather	2022-09-15 18:01:43 -04:00
ghoulslash	6cfacb396e	Merge pull request #2307 from AsparagusEduardo/RHH/pr/debugMapCount ... Automated creation of MAP_GROUP_COUNT for the debug menu	2022-09-15 18:01:05 -04:00
ghoulslash	5bdd292dc3	Merge pull request #2310 from AsparagusEduardo/RHH/pr/FairyUses ... Added missing uses of Fairy type for Union Room and Battle Factory	2022-09-15 18:00:38 -04:00
ghoulslash	354a8256e4	Merge pull request #2226 from Porygon23/AI-Logic-Updates ... Added corner case logic for AI Switching.	2022-09-15 17:56:35 -04:00
Eduardo Quezada	492380bd24	gReservedSpritePaletteCount using MAX_BATTLERS_COUNT for battles	2022-09-14 12:20:59 -03:00
Eduardo Quezada	41d11b0708	Restored filename format for gendered species	2022-09-14 11:13:42 -03:00
TheXaman	ef4e64c2f7	-added a submenu to set the weather ... -lowest flag is 1	2022-09-14 15:19:23 +02:00
TheXaman	1e03b4747f	debug menu: object events now frozen while open	2022-09-14 13:43:26 +02:00
TheXaman	2c20514035	improved debug menu function declaration consistency	2022-09-14 13:39:35 +02:00
Eduardo Quezada	dc423ef7ff	Handling repel/lure menu	2022-09-14 00:18:01 -03:00
Eduardo Quezada	ee628de82f	Config to turn off Hippopotas' and Hippowdon's female icons	2022-09-13 21:42:53 -03:00
Eduardo Quezada	0caf79f702	Merge remote-tracking branch 'blackforest/pokemon_expansion' into RHH/pr/palleteConversion2 ... # Conflicts: # graphics/pokemon/cherrim/anim_front.png # graphics/pokemon/scyther/anim_front.png # graphics/pokemon/scyther/front.png # graphics/pokemon/shinx/anim_front.png # src/data/pokemon_graphics/back_pic_table.h # src/data/pokemon_graphics/front_pic_table.h # src/data/pokemon_graphics/palette_table.h # src/data/pokemon_graphics/shiny_palette_table.h # src/pokemon_icon.c	2022-09-13 20:44:49 -03:00
Eduardo Quezada	c68ca72fb0	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909	2022-09-13 16:26:59 -03:00
Eduardo Quezada	de32940fdf	Further removed trailing whitespaces	2022-09-13 16:26:36 -03:00
Eduardo Quezada	1d7e8bd730	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909 ... # Conflicts: # asm/macros/battle_ai_script.inc # asm/macros/battle_script.inc # data/battle_ai_scripts.s # include/link_rfu.h # src/pokemon.c # src/pokemon_summary_screen.c # src/sound.c	2022-09-13 16:22:42 -03:00
GriffinR	c1dfd3c9ec	Merge pull request #1763 from GriffinRichards/rm-global ... Drop usage of global directive	2022-09-13 15:08:37 -04:00
LOuroboros	2d841a25f9	Removed unused extern declaration of old gUnknown func	2022-09-13 15:45:01 -03:00
GriffinR	91c040b081	Merge pull request #1777 from AsparagusEduardo/pret/pr/trailingWhitespace ... Cleaned trailing whitespace	2022-09-13 14:00:11 -04:00
Ct11217	96d190f5ad	Updated Toxic Status Counter	2022-09-12 20:39:21 -06:00
GriffinR	041870672a	Add misc constant usage to field_weather_effect	2022-09-12 15:11:58 -04:00
GriffinR	d3d8b4a181	Merge pull request #1762 from GriffinRichards/sync-fieldmap ... Sync fieldmap	2022-09-12 14:32:27 -04:00
Eduardo Quezada	ca048e1bc3	Lures now increase the level of encountered mon to max + 1	2022-09-12 10:22:01 -03:00
Eduardo Quezada	0944232059	Added shiny rerolls to Lures + reverted repel var name	2022-09-12 10:21:57 -03:00
Eduardo Quezada	e3005e5275	Item config for repel prompt	2022-09-12 10:21:52 -03:00
Eduardo Quezada	2d78ac0192	Implemented Lures using the same vars as repels	2022-09-12 10:21:49 -03:00
Deokishisu	e3c19f5df5	Implement B2W2 Repel System ... The game now asks if the player would like to use another Repel when the one they used runs out. # Conflicts: # include/constants/vars.h	2022-09-12 10:21:38 -03:00
Eduardo Quezada	66177e7958	Reworked shiny charm rerolls allow adding additional rerolls when necessary	2022-09-12 10:21:21 -03:00
TheXaman	806106b537	removed flickering in debug menu @Jaizu	2022-09-12 12:12:26 +02:00
Eduardo Quezada D'Ottone	17fecd5996	Merge pull request #2313 from LOuroboros/intrepidDoges ... Fixed the hero duo's abilities	2022-09-11 21:45:18 -04:00
LOuroboros	fc65a483aa	Fixed ability pop ups	2022-09-11 22:34:24 -03:00
LOuroboros	717d06bd17	Fixed the hero duo's abilities in doubles	2022-09-11 21:57:42 -03:00
LOuroboros	e624f205ba	Added CompareStat checks for the hero duo's abilities	2022-09-11 21:46:40 -03:00
Eduardo Quezada	65108c3192	Cleaned trailing whitespace	2022-09-11 14:14:49 -04:00
Eduardo Quezada	69f01d73cd	Added missing uses of Fairy type for Union Room and Battle Factory	2022-09-11 12:41:56 -04:00
Jaizu	0daeee83f3	Fix Lure prices ... This change reflects the original prices used in Pokémon let's go pikachu/eevee	2022-09-11 18:06:05 +02:00
Eduardo Quezada	4b1aca19cb	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909 ... # Conflicts: # src/battle_controller_link_opponent.c # src/battle_controller_opponent.c # src/battle_controller_recorded_opponent.c # src/battle_controllers.c # src/data/pokemon_graphics/back_pic_coordinates.h # src/data/pokemon_graphics/front_pic_coordinates.h # src/pokemon.c	2022-09-10 00:17:03 -04:00
Eduardo Quezada	a462db5e69	Automated creation of MAP_GROUP_COUNT for the debug menu	2022-09-09 23:34:05 -04:00
Eduardo Quezada	5e399955d5	Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/monAnimations	2022-09-09 17:37:23 -04:00
Eduardo Quezada	503b85aa2d	Generating music names for the debug menu based on their labels	2022-09-09 16:44:34 -04:00
LOuroboros	ceb0c67bcf	Modified check in case FORM_ITEM_USE of GetFormChangeTargetSpeciesBoxMon	2022-09-09 16:17:13 -03:00
LOuroboros	12fee71008	Merged FORM_ITEM_USE_TIME into FORM_ITEM_USE	2022-09-09 15:39:48 -03:00
Eduardo Quezada D'Ottone	69d3fafdcf	Merge pull request #2273 from LOuroboros/zazaForms ... Introduced FORM_BATTLE form changes	2022-09-09 14:15:53 -04:00
LOuroboros	e8832a2655	Updated FORM_ITEM_HOLD check in GetFormChangeTargetSpeciesBoxMon	2022-09-09 14:56:12 -03:00
Blackforest92	431cb6fa7c	Tidying graphics - Trio Weather	2022-09-09 21:57:40 +07:00
ghoulslash	61cde312cc	Merge pull request #2301 from Blackforest92/RHH-PR-Branch ... Tyding graphics - Acupressure	2022-09-09 10:26:23 -04:00
Eduardo Quezada	8449f237c2	Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/pokemonFlags ... # Conflicts: # src/pokemon.c	2022-09-09 09:02:35 -04:00
Eduardo Quezada	21df8c279b	Added SPECIES_FLAG_CANNOT_BE_TRADED ... - Also corrected Cylarex's forms not having the legendary flag	2022-09-09 08:59:53 -04:00
Eduardo Quezada	1fa9bc1b5c	Adjusted style of coords tables	2022-09-08 18:32:01 -04:00
LOuroboros	db6d285f00	Small syntax fix for CanLearnTeachableMove	2022-09-08 17:53:15 -03:00
Blackforest92	3acb32acb8	Tyding graphics - Acupressure	2022-09-09 00:25:43 +07:00
Eduardo Quezada	7fe1e706b7	Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/pokemonConfig ... # Conflicts: # include/constants/pokemon_config.h	2022-09-08 08:52:13 -04:00
Jaizu	d58af1ba92	Fix 'y' actually being 'x' in CreatePCMultichoice	2022-09-08 10:38:52 +02:00
Eduardo Quezada D'Ottone	066a5bee85	Merge pull request #2277 from TheXaman/tx_debug_system_rhh ... Inclusion of the tx_debug_system	2022-09-08 00:26:37 -04:00
Eduardo Quezada D'Ottone	4a6d3d1deb	Whitespace	2022-09-08 00:19:13 -04:00
Eduardo Quezada D'Ottone	47a50b3dac	Merge branch 'master' into weather_forms_fixes	2022-09-07 23:07:25 -04:00
LOuroboros	05c13614c6	Undefined temporary preproc macro HIBYTE	2022-09-07 13:41:48 -03:00
sbird	3a0759d458	[doc] fix misnamed dma <--> aslr	2022-09-07 14:37:03 +02:00
GriffinR	281bddcd3d	Merge pull request #1765 from AsparagusEduardo/pret/pokefirered_sync4 ... Implemented review changes from https://github.com/pret/pokefirered/pull/548	2022-09-06 21:40:37 -04:00
GriffinR	74b563f696	Merge pull request #1749 from GriffinRichards/ur-classes ... Fix names and constant usage for union room classes	2022-09-06 21:35:10 -04:00
LOuroboros	c8f4a44380	Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux	2022-09-06 20:40:34 -03:00
LOuroboros	8705d1656b	Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into teleport	2022-09-06 20:38:28 -03:00
LOuroboros	a7a1ab9aeb	Merged FORM_ITEM_HOLD_ABILITY into FORM_ITEM_HOLD ... There was never a reason not to.	2022-09-06 19:20:11 -03:00
TheXaman	6062cf45fa	Merge branch 'master' into tx_debug_system_rhh	2022-09-07 00:03:58 +02:00
LOuroboros	f1c153e469	Merged FORM_ITEM_HOLD_ABILITY into FORM_ITEM_HOLD ... There was never a reason not to.	2022-09-06 18:37:16 -03:00
TheXaman	94995c54fb	fix?	2022-09-06 23:35:05 +02:00
Eduardo Quezada	12bb32666b	Aligned FRONTIER_MONS trainer macros with the rest for consistency	2022-09-06 17:05:56 -04:00
Eduardo Quezada D'Ottone	f79e9f02de	Merge pull request #2289 from Blackforest92/RHH-PR-Branch ... Tidying Graphics/Battle_Anims	2022-09-06 17:02:25 -04:00
TheXaman	b249399a53	changed 'B_FLAG_NO_CATCHING' to be evaluated by 'GetBallThrowableState()'	2022-09-06 23:00:26 +02:00
ghoulslash	d33e4b0fe8	Merge pull request #2297 from AsparagusEduardo/RHH/pr/configRefactor ... Config refactor	2022-09-06 15:32:37 -04:00
Eduardo Quezada	3a6318f1d9	Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/configRefactor ... # Conflicts: # include/constants/battle_config.h	2022-09-06 15:20:54 -04:00
ghoulslash	79bfbfb1b0	Merge pull request #2198 from AsparagusEduardo/BE_BattlePikeComatose ... Comatose prevents Battle Pike's status effects.	2022-09-06 15:18:48 -04:00
ghoulslash	971081b8fd	Merge pull request #2286 from AsparagusEduardo/RHH/pr/pretMerge_20220902 ... Flat Merge Friday (Weekly merge)	2022-09-06 15:13:47 -04:00
ghoulslash	51a569b66b	Merge pull request #2290 from AsparagusEduardo/RHH/pr/ballMulti_fix ... Fixed ball multiplier fallthroughs	2022-09-06 15:10:28 -04:00
Eduardo Quezada	7a0838a0f2	Adjusted GetFormChangeTargetSpeciesBoxMon to allow having form changes of the same method in the same table	2022-09-06 10:53:18 -03:00
LOuroboros	0b07f4a06e	Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into zazaForms	2022-09-06 10:53:12 -03:00
LOuroboros	bb290d5ab0	Updates ... -Removed the pointless param1 setting in sXerneasFormChangeTable -Updated the descriptions of Behemoth Blade and Behemoth Bash -Added a new parameter to the struct FormChange -Allowed FORM_BATTLE_BEGIN and FORM_BATTLE_END to replace a move through a new function called "TryToSetBattleFormChangeMoves". -Added missing calls to "CalculateMonStats". -Renamed BoxPokemon pointer in GetFormChangeTargetSpeciesBoxMon for consistency's sake -Optimized check inside UndoFormChange (even though the plan is to get rid of that func entirely.) Special thanks to Blecoutre who fixed my TryToSetBattleFormChangeMoves function. It just wasn't working correctly at all.	2022-09-06 10:45:07 -03:00
sbird	584bfe0221	[debug] add support for mgba printf ... * adds support for mgba printf debugging as well as adding support for switching between debugging configuration * adds `mini_printf` as an alternative to libc printf as well as switches to choose a pretty printing handler * adds a pretty printing format to `mini_printf` to print preproc encoded strings	2022-09-06 13:40:31 +02:00
GriffinR	c8afeea182	Generate trainer pic palettes from image	2022-09-05 16:09:45 -04:00
Eduardo Quezada	cb97f93ef6	Fixed B_SHADOW_TAG_ESCAPE use for Gen 3 config	2022-09-05 14:49:40 -04:00
Eduardo Quezada	7c7da8e176	Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/cleanConfigs ... # Conflicts: # src/battle_script_commands.c	2022-09-05 14:43:04 -04:00
Eduardo Quezada	dbd56efaef	Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902 ... # Conflicts: # src/battle_util.c	2022-09-05 12:20:57 -04:00
U-DESKTOP-K1J86FD\Owner	7dabd903ce	v -> STATUS4_WATER_SPORT (applicable to Gens 3-5)	2022-09-05 12:07:38 -04:00
tustin2121	33f10d2139	Adding missing externs ... If there are not externs on these forward declarations, it's entirely possible for the program to link and missing data to be assigned to someplace presumed in IWRAM or something.	2022-09-05 09:49:20 -04:00
Eduardo Quezada D'Ottone	99a9b9f859	Merge pull request #2218 from LOuroboros/patch-1 ... Updated Serene Grace checks in AI_CheckViability	2022-09-05 10:30:18 -03:00
Eduardo Quezada	d699ea3334	Fixed macro alignments	2022-09-05 08:38:35 -04:00
TheXaman	f6d111d0c7	Update src/debug.c ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-09-05 11:17:21 +02:00
TheXaman	40e3379921	removed music expansion songs, added newline, removed all weekday remains	2022-09-05 11:15:18 +02:00
TheXaman	7696a78760	Update src/trainer_see.c ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-09-05 11:04:21 +02:00
TheXaman	57296dde71	Update src/field_control_avatar.c ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-09-05 11:03:23 +02:00
TheXaman	0b3eddc9a4	Update src/field_control_avatar.c ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-09-05 11:03:01 +02:00
LOuroboros	2deabc2f36	Quick update for GetBattleMonMoveSlot	2022-09-05 04:27:21 -03:00
Eduardo Quezada	2ee843c70d	Proper label for species flags	2022-09-04 22:13:28 -03:00
Eduardo Quezada D'Ottone	d0d4c52d84	Update src/pokemon.c ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2022-09-04 22:03:17 -03:00
Eduardo Quezada	a4c242f2f8	Implemented Shiny Lock functionality	2022-09-04 21:55:59 -03:00
Eduardo Quezada	7500435a80	Implemented review changes from https://github.com/pret/pokefirered/pull/548	2022-09-04 21:24:12 -03:00
Eduardo Quezada	74c3fdfba7	Flag to allow certain species to always have perfect IVs (like Partner Pikachu and Eevee)	2022-09-04 19:41:01 -03:00
Eduardo Quezada	89550ed05d	Updated Sport Ball's modifier.	2022-09-04 18:54:23 -03:00
Eduardo Quezada	ce3dec43a7	Fixed ball multiplier fallthroughs	2022-09-04 17:21:23 -03:00
Blackforest92	2a8d2df6e7	Fix minor oopsies of src/graphics.c - gBattleAnimSpritePal_PrimalParticles	2022-09-04 23:40:00 +07:00
Blackforest92	7e9d243677	Tidying graphics/battle_anims	2022-09-04 23:24:37 +07:00
Eduardo Quezada D'Ottone	1287c3d263	Fixed call to ItemIdToBattleMoveId	2022-09-03 21:27:29 -04:00
Eduardo Quezada D'Ottone	4017fc3e20	Apply style suggestions from code review	2022-09-03 21:22:15 -04:00
Eduardo Quezada	41bf6bde25	Removed pointless macro	2022-09-03 00:28:53 -04:00
Eduardo Quezada	790bdd69f8	Using GET_BATTLER_SIDE and GET_BATTLER_SIDE2	2022-09-03 00:28:32 -04:00
Eduardo Quezada	03498d7240	Applied remaining instances of BATTLE_OPPOSITE and BATTLE_PARTNER	2022-09-02 23:57:43 -04:00
Eduardo Quezada	5403cd036e	Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902 ... # Conflicts: # include/battle.h # include/battle_controllers.h # src/battle_ai_script_commands.c # src/battle_ai_switch_items.c # src/battle_controller_opponent.c # src/battle_controller_player.c # src/battle_controllers.c # src/battle_main.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c	2022-09-02 23:24:08 -04:00
GriffinR	97021baec6	Drop usage of global directive	2022-09-02 21:53:44 -04:00
GriffinR	8b7230c3c4	CpuFastFill -> CpuFastFill16 in fieldmap	2022-09-02 19:41:28 -04:00
GriffinR	7f1c4720a2	Update arguments for ApplyGlobalTintToPaletteSlot	2022-09-02 19:36:46 -04:00
GriffinR	03a98c72bc	Sync fieldmap	2022-09-02 19:29:35 -04:00
Porygon23	ba6aad5bcc	Merge branch 'master' into AI-Logic-Updates	2022-09-02 14:44:47 -06:00
TheXaman	13cc640b78	whitspace changes, removed wrong comment	2022-09-02 18:53:51 +02:00
TheXaman	b4b3e84cbd	removed default flags and added ingame warning if a function that requires them is used	2022-09-02 18:39:38 +02:00
Eduardo Quezada D'Ottone	c58dfa63a1	Merge remote-tracking branch 'RHH/master' into PE_monAnimations ... # Conflicts: # src/pokemon.c	2022-09-02 12:06:43 -04:00
TheXaman	367b12801e	changed debug_config.h to overworld_config.h, ... changed no bag use and no catching flags to battle_config.h, removed TX reference (big sad)	2022-09-02 12:33:42 +02:00
TheXaman	ad57551db1	removed unnecessary script, cheat start now with national dex, reverted accidental type hin removal, changed indentation	2022-09-02 12:10:11 +02:00
Eduardo Quezada D'Ottone	59f1f10dec	Merge pull request #2260 from DizzyEggg/magic_bounce ... Fix Magic Bounce targets	2022-09-01 19:56:15 -04:00
Sérgio Augusto Vianna	60132b29fb	Fixed pickup running when it shouldn't in some cases.	2022-09-01 15:37:52 -03:00
GriffinR	a28fbbc1b8	Merge pull request #1748 from GriffinRichards/fix-judgement ... Standardize judgement vs judgment spelling	2022-09-01 11:51:04 -04:00
LOuroboros	5d346fd939	Updated a couple more sizeofs	2022-08-31 23:49:43 -03:00
LOuroboros	b9a32a93f5	Update src/data/text/move_descriptions.h ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-08-31 23:39:59 -03:00
LOuroboros	ea345f90f5	Picked the correct pointers for correctness' sake	2022-08-31 23:06:20 -03:00
LOuroboros	e02b33ee11	Automatized the contents of some sideof in src/item.c	2022-08-31 23:00:24 -03:00
Eduardo Quezada	8d94c58cac	Shows exp when leveling up with Exp Candies	2022-08-31 21:54:27 -04:00
LOuroboros	452b135c7f	I forgot to replace the function calls where appropriate :P	2022-08-31 19:17:09 -03:00
Eduardo Quezada	3264c3c87a	Shows amount of Exp gained.	2022-08-31 09:05:51 -04:00
Eduardo Quezada	fe5f30c200	Fixed moves learned at the same level being skipped while using exp candies	2022-08-30 22:50:46 -04:00
Eduardo Quezada	29448b6acc	Fixed XL Candy going out of bounds. Also added failsafe in case an invalid param is used.	2022-08-30 22:06:25 -04:00
Eduardo Quezada	494e8791d7	Fixed tutors changing levels	2022-08-30 22:06:25 -04:00
LOuroboros	7b8226a8af	Added descriptions for LA's moves	2022-08-30 23:05:22 -03:00
LOuroboros	cc86b2fd96	Added Z-Move stats for LA's moves	2022-08-30 20:29:36 -03:00
LOuroboros	c167e2c6cc	Added Legends: Arceus' move data	2022-08-30 19:32:44 -03:00
DizzyEggg	7cb010d71e	fix magic bounce conflicts and fix magic coat	2022-08-30 19:36:06 +02:00
Eduardo Quezada	c2c18444b1	Updated HasAllMons to account for all Pokémon	2022-08-30 12:51:00 -04:00
Eduardo Quezada	925384eedc	Generations of Pokémon can now be disabled individually	2022-08-30 12:50:59 -04:00
Eduardo Quezada	e9a5442be5	Removed unused ITEM_EXPANSION constants from base stats	2022-08-30 12:50:59 -04:00
Eduardo Quezada	df4c065ea6	Separated P_NEW_POKEMON into sections by generation. ... Sizes: - GEN_3 15.690.076 bytes - GEN_4 17.480.816 bytes - GEN_5 19.544.944 bytes - GEN_6 20.907.332 bytes - GEN_7 22.233.288 bytes - GEN_8 23.605.744 bytes	2022-08-30 12:50:59 -04:00
TheXaman	c13561e5ba	simplified filed controls code for debug menu	2022-08-30 18:15:06 +02:00
TheXaman	04c40677bd	Changed the way debug flags are handled, now in constants/battle_config.h	2022-08-30 17:41:35 +02:00
TheXaman	e09ba650f3	imrpoved code formatting in field_control_avatar as per suggestion	2022-08-30 17:12:23 +02:00
TheXaman	5fed45e40b	Update src/item_use.c ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2022-08-30 17:04:14 +02:00
TheXaman	2f61407c78	Update src/field_control_avatar.c ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2022-08-30 17:04:02 +02:00
TheXaman	725a9102ee	Update src/new_game.c ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2022-08-30 17:03:44 +02:00
TheXaman	155465a919	Update src/pokemon_storage_system.c ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2022-08-30 17:03:28 +02:00
TheXaman	79c4fa560f	Update src/start_menu.c ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2022-08-30 17:03:07 +02:00
TheXaman	cc921c62d7	Update src/field_control_avatar.c ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2022-08-30 17:01:59 +02:00
TheXaman	61c95421eb	Update src/event_object_movement.c ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2022-08-30 17:01:46 +02:00
LOuroboros	df88317a98	Introduced FORM_BATTLE form changes ... For species such as Xerneas and Zacian.	2022-08-29 19:10:52 -03:00
TheXaman	8cf2933658	added preproc directive to main debug.c code	2022-08-29 19:46:03 +02:00
TheXaman	bed5639074	Changed preproc defines to TRUE/FALSE, small cleanup	2022-08-29 19:36:44 +02:00
TheXaman	8c9a59ec1c	Merge branch 'tx_debug_system' of https://github.com/TheXaman/pokeemerald into tx_debug_system_rhh	2022-08-29 19:13:11 +02:00
ghoulslash	2cd01bd95d	Merge pull request #2239 from DizzyEggg/quash ... Quash	2022-08-29 10:43:54 -04:00
Blackforest92	b209645b20	Changes Origin to Origin Forme	2022-08-29 21:33:28 +07:00
Eduardo Quezada D'Ottone	32a1017c2d	Fixed tab	2022-08-29 10:13:01 -04:00
Blackforest92	61c33f56a0	Updated to latest master branch + add PLA's data to teachable_learnsets.h	2022-08-29 21:01:31 +07:00
TheXaman	006d28fd69	tiny fix for wrong "give pokemon" window	2022-08-29 14:51:40 +02:00
TheXaman	94183b45c7	Added options for ttoggling battle frontier pass and giving max BPs	2022-08-29 14:48:40 +02:00
DizzyEggg	2d4ac679a6	tabs	2022-08-29 10:26:55 +02:00
DizzyEggg	27010e9ee6	quash faintclearsetdata	2022-08-29 10:23:26 +02:00
Eduardo Quezada D'Ottone	8612300020	Merge branch 'master' into patch-1	2022-08-29 04:22:48 -04:00
Eduardo Quezada D'Ottone	8ca2f949e3	Merge pull request #2233 from gruxor/tmhm_rework ... Reworked TMHM into expandable list format	2022-08-29 04:20:45 -04:00
crater-git	1c735e1abe	Restored bool32 type to shouldUseMove	2022-08-29 03:47:11 -04:00
DizzyEggg	b9babd9ff1	Merge pull request #2264 from AsparagusEduardo/RHH_pretMerge20220826 ... Friday Night Mergin' (weekly merge)	2022-08-29 09:17:40 +02:00
LOuroboros	5801047e50	Removed unused local var in SetMonFormPSS	2022-08-28 12:10:54 -03:00
Blackforest92	d6998d4579	Edited PLA' pokedex_text.h	2022-08-28 19:55:45 +07:00
crater-git	9f16d1dd12	Fixed battle frontier tutors (for real this time)	2022-08-27 22:45:10 -04:00
Eduardo Quezada	1c8d3a4922	Removed unnecessary parenthesis	2022-08-27 11:19:50 -04:00
Eduardo Quezada	99fbad92e2	IS_BATTLER_OF_TYPE	2022-08-27 02:50:55 -04:00
Eduardo Quezada	69f4c226f0	Merge remote-tracking branch 'RHH/master' into RHH_cleanConfigs ... # Conflicts: # src/battle_ai_main.c # src/battle_controller_opponent.c # src/battle_controller_player.c # src/battle_script_commands.c # src/pokemon.c # src/pokemon_summary_screen.c	2022-08-27 02:42:22 -04:00
Eduardo Quezada	866d916f2f	SpriteTemplate formatting	2022-08-27 02:07:58 -04:00
Eduardo Quezada	1f0a952546	Usage of BATTLE_OPPOSITE	2022-08-27 01:44:39 -04:00
Eduardo Quezada	15d611ba65	Usage of BATTLE_PARTNER	2022-08-27 01:26:13 -04:00
Eduardo Quezada	6c457f42af	Corrected uses of GetBattlerSide	2022-08-27 00:59:12 -04:00
Eduardo Quezada	0a34d47041	Merge remote-tracking branch 'pret/master' into pret_clean2	2022-08-27 00:56:00 -04:00
Eduardo Quezada	481210b7f3	Missing uses of MAX_SPRITES	2022-08-27 00:54:30 -04:00
Eduardo Quezada	7c86bd5d08	Merge remote-tracking branch 'pret/master' into RHH_pretMerge20220826 ... # Conflicts: # include/battle_interface.h # src/battle_anim_effects_1.c # src/battle_script_commands.c # src/field_specials.c	2022-08-26 22:23:37 -04:00
SomeLoserThatCantPickOriginalUsernames	bd81841c30	Fix Escape Rope Message when on gen 8 mechanics	2022-08-26 17:47:45 -07:00
LOuroboros	922bbacd71	Updated GetMonFriendshipScore ... -Moved it to src/pokemon.c -Made a battle specific variant called GetBattlerFriendshipScore. -Made that variant return 0 for Mega Evolved 'mons and if called on link battles.	2022-08-26 21:33:43 -03:00
GriffinR	578064d799	Add missing use of METATILE_ROW_WIDTH	2022-08-26 15:23:54 -04:00
Eduardo Quezada D'Ottone	bee36edd9c	Merge pull request #2173 from LOuroboros/yourAffection ... Implement affection-now-friendship mechanics	2022-08-26 14:54:32 -04:00
GriffinR	0516f94837	Merge pull request #1753 from LOuroboros/GetLeadMonFriendshipScore ... Added constants for GetLeadMonFriendshipScore	2022-08-26 14:52:10 -04:00
crater-git	f8fb4e8cf2	Renamed funcs, lists, etc. - Teach->Teachable	2022-08-26 14:48:06 -04:00
GriffinR	c5e873aa2b	Merge pull request #1742 from GriffinRichards/sound-pan ... Add missing usage of SOUND_PAN_*	2022-08-26 14:47:24 -04:00
crater-git	b8a3cc2846	Consolidated funcs, renamed CanMonLearnMove	2022-08-26 11:07:08 -04:00
crater-git	54ee960970	Fixed Battle Frontier tutor move IDs	2022-08-26 10:12:11 -04:00
DizzyEggg	6331931ba3	Fix Magic Coat targets	2022-08-26 15:01:51 +02:00
Eduardo Quezada	77e2a2da32	Fixed Net Ball Gen 7+ multiplier	2022-08-25 23:19:46 -04:00
Eduardo Quezada D'Ottone	399a0c9d6f	Merge pull request #2142 from AgustinGDLV/exp_candy ... Gen 8 EXP Candies	2022-08-25 23:03:24 -04:00
Eduardo Quezada D'Ottone	57d583b783	Fixed call to sExpCandyExperienceTable	2022-08-25 22:49:23 -04:00
Eduardo Quezada D'Ottone	6b414d9555	Apply suggestions from code review ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2022-08-25 22:40:19 -04:00
GriffinR	ce4a6e9067	MAP_NONE -> MAP_DYNAMIC	2022-08-25 21:34:05 -04:00
crater-git	ed02c4b425	Removed tutor move distinction, combined llists	2022-08-25 19:56:47 -04:00
AgustinGDLV	e204527f43	changed candy item parameters	2022-08-25 15:52:47 -07:00
LOuroboros	8bd7103b9d	Even more review corrections	2022-08-25 17:32:12 -03:00
DizzyEggg	622a7f8141	merge with master	2022-08-25 22:10:59 +02:00
LOuroboros	2cf2c00b29	Updated friendship labels	2022-08-25 17:10:11 -03:00
LOuroboros	7539051942	Further tweaked the affection animation	2022-08-25 17:05:57 -03:00
ghoulslash	15a368163d	Merge pull request #2247 from AsparagusEduardo/RHH_specialPic ... LoadSpecialPokePic adjustments	2022-08-25 15:35:21 -04:00
ghoulslash	591bac25c4	Merge pull request #2243 from AsparagusEduardo/RHH_placeholderMoves ... Moves with EFFECT_PLACEHOLDER can't be used.	2022-08-25 15:34:23 -04:00
ghoulslash	b45e1887d8	Merge pull request #2242 from AsparagusEduardo/RHH_fixOrbPower ... Fixed creation trio orbs not boosting power for non-base forms.	2022-08-25 15:18:02 -04:00
LOuroboros	1bfff42ad2	Fixed ENDTURN_STATUS_HEAL	2022-08-25 12:38:47 -03:00
DizzyEggg	1b9c2816c2	fix updatehptextinhealthbox arguments	2022-08-25 17:37:47 +02:00
DizzyEggg	63370b065d	Party menu supports 4digit hp	2022-08-25 17:31:14 +02:00
LOuroboros	1fc63c3431	More review corrections	2022-08-25 11:52:21 -03:00
LOuroboros	23bf67c63f	Removed unnecessary inclusion of header in src/field_specials.c	2022-08-25 11:43:01 -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
GriffinR	8a1130d046	Missing constant in friendshiptodamagecalculation	2022-08-25 10:21:41 -04:00
LOuroboros	5b74fa3fd3	Assigned boolean values to allowedToChangeFormInWeather	2022-08-25 11:10:43 -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	90ae339cac	Merge pull request #2240 from AsparagusEduardo/RHH_fixBEMerge ... Included PR #2219 that was accidentally merged into BE	2022-08-25 08:47:38 -04: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
Eduardo Quezada	b2af7a1b47	Fixed critical capture fields not using TRUE or FALSE	2022-08-25 01:17:17 -04:00
Eduardo Quezada	045dbcf81e	Fixed creation trio orbs not boosting power for non-base forms.	2022-08-25 00:48:35 -04:00
Eduardo Quezada D'Ottone	a210e45c61	Merge pull request #2234 from rh-hideout/DizzyEggg-abilpopup ... Ability pop-up displays properly long abilities	2022-08-25 00:17:38 -04:00
Eduardo Quezada D'Ottone	5659f6178f	Optimized x adjustment	2022-08-25 00:03:43 -04:00
gruxor	d719510d32	Apply suggestions from code review ... Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-08-24 22:31:52 -04:00
LOuroboros	1d512ed57d	Updated Serene Grace checks in AI_CheckViability	2022-08-24 20:00:13 -03:00
Eduardo Quezada D'Ottone	62175cc655	Merge pull request #2235 from rh-hideout/DizzyEggg-patch-1 ... Get rid of garbage bytes in graphics.c	2022-08-24 18:56:08 -04:00
Eduardo Quezada	30594a9773	Included PR that was accidentally merged into BE	2022-08-24 18:37:25 -04:00
DizzyEggg	4f790a6ec0	spaces	2022-08-24 23:47:42 +02: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
GriffinR	32ea55dcba	Merge pull request #1752 from LOuroboros/patch-4 ... Re-aligned READ_PTR_FROM_TASK's 2nd line EoL	2022-08-24 17:08:15 -04:00
GriffinR	8cc520ccd7	Merge pull request #1751 from LOuroboros/patch-3 ... Fixed KeyInterCB_DeferToEventScript comment	2022-08-24 17:07:59 -04:00
DizzyEggg	7aa55f2753	better interface 1 player mon in double	2022-08-24 23:00:21 +02:00
LOuroboros	015961c00a	Re-aligned READ_PTR_FROM_TASK's 2nd line EoL	2022-08-24 17:19:24 -03:00
LOuroboros	3a65529293	Fixed KeyInterCB_DeferToEventScript comment	2022-08-24 17:12:59 -03:00
LOuroboros	90f72a745a	Fixed switch syntax in Task_TryFieldPoisonWhiteOut	2022-08-24 17:01:36 -03:00
DizzyEggg	e3ab439ec0	Fix multi wild battles	2022-08-24 21:56:24 +02:00
DizzyEggg	cc8dd92247	ENDTURN_WISH resets gBattleStruct->turnSideTracker	2022-08-24 20:48:47 +02:00
DizzyEggg	0bf2b26491	Get rid of garbage bytes in graphics.c	2022-08-24 20:36:49 +02:00
DizzyEggg	17b47de90d	Ability pop-up displays properly long abilities	2022-08-24 20:20:44 +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
crater-git	1ff5bdca9d	Added list endings to otherwise empty learnsets	2022-08-24 11:55:39 -04:00
Blackforest92	fb00ac977a	Adjust endif in form_species_tables.h to include Hisuian Sneasel and Qwilfish	2022-08-24 16:21:45 +07: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	ec4ff0acb7	Update battle_debug.c	2022-08-24 01:33:00 -04:00
Eduardo Quezada D'Ottone	2bd06dee1d	Update battle_debug.c	2022-08-24 01:21:06 -04:00
Eduardo Quezada D'Ottone	21867a6061	Merge branch 'master' into AI	2022-08-24 01:07:35 -04:00
Eduardo Quezada D'Ottone	21fe205f0f	Merge pull request #2206 from Blackforest92/Minor_Graphic_Fixes ... Fix multiple pokemon icons & tidying pokemon graphic folders	2022-08-24 00:52:49 -04:00
Eduardo Quezada D'Ottone	8f12e1f5c6	Merge pull request #2125 from ghoulslash/be/escapepreventionfix ... fix IsAbilityPreventingEscape message in party menu	2022-08-24 00:48:57 -04:00
Eduardo Quezada D'Ottone	33e1562253	Merge pull request #2219 from aarant/battle_engine ... Fixed Gen5+ multihit odds.	2022-08-24 00:34:58 -04:00
Eduardo Quezada	eea718cfc6	Placeholder moves can't be used in battle.	2022-08-24 00:30:49 -04:00
crater-git	7ac2f566fd	Re-added PP if statements for P_NEW_POKEMON	2022-08-23 23:08:38 -04:00
Eduardo Quezada	56a2e91518	Updated move limitations	2022-08-23 22:40:04 -04:00
Eduardo Quezada	09fd393f97	Replaced instances of power == 0 with IS_MOVE_STATUS + fixed Wonder Skin	2022-08-23 22:38:35 -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
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	c1c9837bfc	Merge remote-tracking branch 'RHH/item_expansion' into MergedBranchUltimate	2022-08-22 17:31:21 -04:00
Eduardo Quezada	2b7a2c4d09	Merge remote-tracking branch 'RHH/battle_engine' into MergedBranchUltimate	2022-08-22 17:30:48 -04: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
Martin Griffin	f4a2040843	Options menu: cleanup	2022-08-22 08:38:06 +01: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
Martin Griffin	2aa821176b	Options menu: sort #includes	2022-08-21 15:06:05 +01:00
Martin Griffin	ba6d4866e4	Options menu: standardize task data	2022-08-21 15:05:57 +01: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
GriffinR	81ef818f61	Merge pull request #1731 from GriffinRichards/missing-tag ... Move party menu data constants	2022-08-20 22:43:52 -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	6fed961ed6	Write palette IDs in hex	2022-08-19 15:29:35 +01:00
Blackforest92	2b512a8e03	Fix Voltorb and Exeggutor' form species table	2022-08-19 18:14:11 +07:00
Blackforest92	346f3b7f4c	Fix PLA's base_stats.h (rename .item2 to .itemRare)	2022-08-19 18:01:28 +07: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
GriffinR	936ebbd973	Fix phaseShit typo	2022-08-17 11:47:00 -04:00
Eduardo Quezada	5933c42439	Synced Route 4 and 10's MapSec labels	2022-08-16 18:23:37 -04:00
GriffinR	2ec8f27811	Add missing usage of SOUND_PAN_*	2022-08-16 13:04:00 -04:00
Eduardo Quezada	7b0c8ec972	Revert style changes	2022-08-15 20:41:12 -04:00
Eduardo Quezada	44b26cc8aa	From pokefirered	2022-08-15 18:27:37 -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
Ct11217	bb978764f3	Fixed recommended changes ... Added additional double battle logic for yawn	2022-08-13 00:39:44 -06:00
GriffinR	5515e328b2	Clean up lock/unlock anim movement	2022-08-12 21:18:10 -04:00
Ct11217	7378d1099b	Removed AI_GetAbility ... Misc cleanup	2022-08-12 15:21:25 -06:00
AgustinGDLV	a5e742afcd	implemented review changes	2022-08-12 12:00:05 -07: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
Eduardo Quezada D'Ottone	3d94ada041	Merge pull request #2166 from Sneed69/fix_tm_compat ... Fix tm/hm compatibility	2022-08-11 10:07:03 -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
WhenGryphonsFly	475658116e	Fix BUGFIX return statement in battle_dome.c	2022-08-10 20:00:16 -05:00
WhenGryphonsFly	86881b12ef	Use PARTY_SIZE for Pokerus Nurse Conversation	2022-08-10 19:09:59 -05:00
GriffinR	e06ba39751	Use button constants in Task_HandleChooseMonInput	2022-08-10 15:14:35 -04:00
GriffinR	f534e8e44a	Move party menu data constants	2022-08-10 14:30:01 -04:00
GriffinR	bfdbbad468	Split naming screen palettes/graphics, use correct image palettes, clean up	2022-08-09 09:27:28 -04:00
ghoulslash	eb0cc91dce	Merge pull request #2224 from AsparagusEduardo/BE_cosntantsZmove ... B_WIN constants in battle_z_move.c	2022-08-08 21:13:23 -04:00
Eduardo Quezada	4b08a511c3	Cleanup from https://github.com/pret/pokefirered/pull/532	2022-08-07 22:40:15 -04:00
LOuroboros	80057fc990	Update battle_z_move.c	2022-08-07 10:19:03 -03:00
GriffinR	079b1762ac	Update special save sector size checks	2022-08-05 12:11:33 -04:00
GriffinR	2487ddb128	Sector security -> signature	2022-08-05 10:42:31 -04:00
Eduardo Quezada D'Ottone	08f08ece98	B_WIN constants in battle_z_move.c	2022-08-04 15:35:08 -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	49da2ee53f	Remove all the ifdefs for BATTLE_ENGINE, ITEM_EXPANSION, and POKEMON_EXPANSION	2022-08-02 00:15:55 -05:00
Ariel A	9a0a759b3f	Fixed multihit odds.	2022-08-01 20:23:25 -04:00
Eduardo Quezada	b49f8c10ad	Review changes from https://github.com/pret/pokefirered/pull/525	2022-08-01 15:37:05 -04:00
Eduardo Quezada	cc288e3786	Review changes	2022-08-01 15:14:21 -04:00
Eduardo Quezada	7ea49adf3c	CpuCopy16 in UnkUtil_CpuRun	2022-08-01 08:04:48 -04:00
Eduardo Quezada	c6cdb2a281	Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge	2022-07-31 22:57:46 -04:00
benicioneto	3d8aeeac77	Fix the AI ... The AI was using only the first move, and soft locking when the first move's PP ends	2022-07-30 17:33:48 -03:00
Eduardo Quezada	a72d4c4168	Cleanup from syncing pss and mon markings	2022-07-30 12:43:14 -04:00
Eduardo Quezada D'Ottone	22ab78e2f8	Fixed Steam Eruption's long name	2022-07-30 00:10:20 -04:00
Eduardo Quezada	897b3d07f6	Sync src/pokeball.c with pokefirered	2022-07-29 21:29:12 -04:00
Eduardo Quezada	2e1bf0d965	OamData mosaic FALSE	2022-07-29 21:27:39 -04:00
Eduardo Quezada	2214b01954	Forgot to include this fix	2022-07-29 17:07:56 -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	aa93af4083	Fixed check	2022-07-29 10:34:21 -04:00
Eduardo Quezada	fa32f337be	Review changes	2022-07-29 10:21:20 -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
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
ghoulslash	0c79d04dec	Merge pull request #1928 from AsparagusEduardo/BE_fixTransformForm ... Prevent Transforming Pokémon from changing forms	2022-07-28 22:26:56 -04:00
ghoulslash	5a850b0b4e	Merge pull request #2212 from AsparagusEduardo/BE_healBallFix ... Fixed Heal Ball not always healing caught Pokémon	2022-07-28 22:22:20 -04: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
Eduardo Quezada	dc47a959da	Reverted comments from pokefirered	2022-07-27 20:33:34 -04:00
Eduardo Quezada	b00bd8b181	Cleaned by comparing evolution_scene.c with pokefirered	2022-07-27 18:51:32 -04:00
Martin Griffin	2380d13a43	Macros for keeping .partyFlags, .partySize, and .party in sync	2022-07-27 23:25:37 +01:00
GriffinR	4ffe75c611	Merge pull request #1707 from GriffinRichards/use-pocket-consts ... Add some missing pocket constant usage	2022-07-27 12:22:01 -04: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
Eduardo Quezada D'Ottone	0f6186d8ab	Merge pull request #2211 from AsparagusEduardo/BE_Gen3Switch ... Config for Gen 3 faint switch mechanics	2022-07-27 08:14:13 -04:00
Eduardo Quezada	7af85b0c49	Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge	2022-07-27 08:12:08 -04:00
Eduardo Quezada D'Ottone	aebd667260	Merge remote-tracking branch 'RHH/battle_engine' into BE_fixTransformForm ... # Conflicts: # src/battle_ai_main.c	2022-07-26 17:00:53 -04:00
GriffinR	5366e89258	Merge pull request #1713 from DizzyEggg/patch-1 ... Change GAME_LANGUAGE to LANGUAGE_ENGLISH	2022-07-26 11:08:05 -05:00
Eduardo Quezada D'Ottone	611b192e8c	Small AI fixes by mrgriffin	2022-07-26 09:53:39 -04:00
DizzyEggg	b7c78571a6	Update src/international_string_util.c ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2022-07-26 15:39:29 +02:00
DizzyEggg	c557c4eb27	Add a comment	2022-07-26 14:44:53 +02: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	8d18fc0dd8	Fixed Heal Ball not always healing caught Pokémon	2022-07-25 08:54:03 -04:00
Eduardo Quezada D'Ottone	bfb86fdc86	Config for Gen 3 faint switch mechanics	2022-07-24 14:57:47 -04:00
Eduardo Quezada	be22f299f8	Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge	2022-07-24 14:00:10 -04:00
LOuroboros	f1d8d006f3	Corrected usage of B_PRANKSTER_DARK_TYPES in AI_CheckBadMove	2022-07-24 06:47:50 -03:00
DizzyEggg	151b5a5f8a	Change GAME_LANGUAGE to LANGUAGE_ENGLISH	2022-07-23 12:23:04 +02: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	cef730e451	Merge pull request #2196 from AsparagusEduardo/IE_pretmerge ... Item Expansion pret merge	2022-07-22 14:01:50 -04:00
ghoulslash	0588bba193	Merge pull request #2195 from AsparagusEduardo/PE_pretmerge ... Pokémon Expansion pret merge	2022-07-22 14:01:27 -04:00
ghoulslash	3a77b52bad	Merge pull request #2194 from AsparagusEduardo/BE_pretmerge ... Battle Engine pret merge	2022-07-22 14:00:40 -04:00
Blackforest92	56f4c319a4	Fix multiple pokemon graphics, tidying pokemon graphic folders	2022-07-22 22:17:29 +07:00
Eduardo Quezada D'Ottone	af72fb0d32	Simplified pre-gen5 checks	2022-07-21 16:36:07 -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	24bb2f7ed0	Merge pull request #2179 from LOuroboros/pinch ... Removed global and unused IsPinchBerryItemEffect	2022-07-21 16:14:56 -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
ghoulslash	2ce32afeaa	Merge pull request #2202 from AsparagusEduardo/BE_SkyDrop ... Sky Drop fixes	2022-07-21 16:06:42 -04:00
ghoulslash	2fc15ab779	Merge pull request #2203 from AsparagusEduardo/BE_ghostEscapeAiFix ... Ghost Escape config AI fix	2022-07-21 16:00:33 -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	eb582b1355	Merge pull request #2178 from ghoulslash/be/ai_fix ... fix GetAiLogicData logic	2022-07-21 14:47:21 -04:00
ghoulslash	462a144956	Merge pull request #2200 from AsparagusEduardo/BE_ZMove_power ... Updated Z-Move power for Gen 8 moves and moves with power varying by Gen	2022-07-20 18:10:31 -04:00
Eduardo Quezada D'Ottone	d87610a1e0	Ghost Escape config AI fix	2022-07-20 15:31:08 -04:00
Eduardo Quezada D'Ottone	76f5926743	Sky Drop check in IsBattlerTrapped	2022-07-20 15:29:40 -04:00
Eduardo Quezada D'Ottone	343e685537	Sky Drop fixes ... - Sky Drop was using lbs in the formula instead of hectograms. This has been fixed. - Sky Drop is now affected by weight modifiers like Float Stone. - Enabled AI_CheckBadMove for Sky Drop.	2022-07-20 15:13:53 -04:00
Eduardo Quezada D'Ottone	b8ea412e61	AI logic for Charge	2022-07-20 14:44:57 -04:00
Eduardo Quezada D'Ottone	212ecb98ce	Added AI checks.	2022-07-20 14:28:49 -04:00
AgustinGDLV	90d86d4b04	pulled IE	2022-07-20 10:53:19 -07:00
AgustinGDLV	9c73cb322e	replaced bitfield with LUT	2022-07-20 10:48:09 -07:00
Eduardo Quezada D'Ottone	0f3fdd410a	Config for Sturdy's Gen5+ effect.	2022-07-20 13:06:41 -04:00
Eduardo Quezada D'Ottone	f00beac3f9	Updated Z-Move power for Gen 8 moves and moves with power varying by Gen	2022-07-20 11:32:16 -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	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	2b5bb9f6e4	move gSwapDamagecategory to battle struct, use GetSplitBasedOnStats for photon geyser check	2022-07-19 18:24:53 -04:00
Eduardo Quezada D'Ottone	64115a873f	Comatose prevents Battle Pike's status effects.	2022-07-18 18:15:44 -04:00
Eduardo Quezada D'Ottone	1cfb267b34	Config for Explosion halving defense	2022-07-18 13:10:27 -04:00
ghoulslash	f2ee9f3ba0	tweak z indicator position relative to healthbox	2022-07-18 09:44:04 -04:00
Eduardo Quezada D'Ottone	e55fea47f3	Added missing MOVE_UNAVAILABLE to Gorilla Tactics check	2022-07-18 09:24:08 -04:00
ghoulslash	18affe8c1a	new z move indicator, credits to blackforest	2022-07-18 09:21:59 -04:00
Eduardo Quezada D'Ottone	1dcbf59686	Config for Plus and Minus interaction	2022-07-18 08:11:02 -04:00
sphericalice	65db9238e8	Give Pikachu its typing back	2022-07-18 09:41:04 +01:00
GriffinR	a8c93dcf35	Add missing font constants after EXT_CTRL_CODE_FONT	2022-07-18 02:36:25 -04:00
ghoulslash	f6b6ab56be	some style fixes	2022-07-17 19:16:13 -04:00
ghoulslash	6b84a9f0b3	merge w be	2022-07-17 12:40:43 -04:00
ghoulslash	9b5aee3b93	fix z stat-boosts	2022-07-17 12:17:54 -04:00
GriffinR	165f51a295	Merge pull request #1701 from GriffinRichards/faint-cmd-name ... Rename faintifabilitynotdamp and jumpifattackandspecialattackcannotfall	2022-07-16 08:15:54 -04:00
ExpoSeed	da4d1bc626	Merge pull request #2176 from LOuroboros/patch-1 ... Fixed Pokéblock Case's description	2022-07-16 03:35:26 -05:00
LOuroboros	0651cc9fe4	Updated Cmd_handleballthrow	2022-07-16 05:09:32 -03: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
LOuroboros	26e03dcda8	Linked MENU_ACTION constants to the items in sStartMenuItems	2022-07-15 04:45:05 -03:00
LOuroboros	cec7e30ef1	Update battle_moves.h	2022-07-15 01:51:36 -03:00
GriffinR	16ab534ddb	Add some missing pocket constant usage	2022-07-14 10:27:51 -04:00
GriffinR	f85b4699dc	Fix conditional in SpriteCB_DeoxysRockFragment	2022-07-12 21:29:36 -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
sphericalice	167353223c	Use MAX_MON_MOVES in Cmd_trysetencore	2022-07-11 15:23:23 +01: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
GriffinR	06dc93fc2f	Clean up field_poison.c	2022-07-06 21:04:54 -04:00
GriffinR	2c4c9497d2	Fix comment	2022-07-06 15:02:17 -04:00
GriffinR	e6a374f2b6	Rename faintifabilitynotdamp and jumpifattackandspecialattackcannotfall	2022-07-06 14:49:08 -04:00
LOuroboros	640974b164	Update items.h	2022-07-05 22:13:15 -03:00