Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,854 Commits 1 Branch 0 Tags
Commit Graph

13536 Commits

Author SHA1 Message Date
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
Ariel A
4bee03bc18 Merge branch 'followers' into lighting 2023-01-03 18:19:19 -05:00
Ariel A
a59564fc1e Improved follower pokemon animation code. 2023-01-03 18:18:13 -05:00
Ariel A
beb282a359 Added movements/scripts for overworld follower field moves. 2023-01-03 18:18:09 -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