ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-10 13:45:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,403 Commits 1 Branch 0 Tags 235 MiB
017f44f5ac
Commit Graph

1043 Commits

Author SHA1 Message Date
AgustinGDLV
6235970722 added special battle evo changes 2022-05-05 11:41:27 -07:00
BuffelSaft
cbf0a6704b Set Sticky Web user to Court Change user 
This is for Mirror Armor to track the current user of Sticky Web/the mon that caused the stat drop.
 2022-05-01 12:54:33 +12:00
BuffelSaft
af6242f2e0 Requested changes, Sticky Web edge case 
Fix issues found by ghoulslash, and make sure Defiant works properly with Sticky Web and Court Change.
 2022-04-27 21:51:10 +12:00
BuffelSaft
5358cc0a00 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2 2022-04-25 13:38:13 +12:00
LOuroboros
434f6cf5ad Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE 2022-03-26 08:43:55 -03:00
ultima-soul
86089ce935 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2022-02-28 22:13:14 -08:00
BuffelSaft
6a119c5a30 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2 2022-02-13 21:06:15 +13:00
LOuroboros
b52233ec31 Updated Conversion's effect 2022-02-11 21:42:39 -03:00
ghoulslash
209279c207 fix psycho shift string printing 2022-02-09 14:30:30 -05:00
BuffelSaft
9d1800f53e Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2 2022-01-27 17:18:51 +13:00
LOuroboros
8eaf0718ec Review changes 
Also updated tryfaintmon call in BattleScript_FlingEnd, and updated CanFling.
 2022-01-23 19:13:04 -03:00
ghoulslash
a165f9926d canbestatused for psycho shift 2022-01-23 13:46:30 -05:00
LOuroboros
a8a8c7e2fa Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE 2022-01-23 02:37:07 -03:00
Eduardo Quezada D'Ottone
b7df21b263 Optimized use of GetBattlerAbility 2022-01-22 20:25:51 -03:00
Eduardo Quezada D'Ottone
f42c4cd689
Merge pull request #1734 from ghoulslash/magician 
Magician
 2022-01-21 16:03:15 -03:00
Eduardo Quezada D'Ottone
ddfc3502f7 Fixed Pokémon Expansion flag name 2022-01-16 17:21:05 -03:00
ghoulslash
f3b9e6bb63
Merge pull request #1976 from kleeenexfeu/patch-2 
[battle_engine]  Moxie interaction with spread move/follow me fix
 2022-01-16 10:58:50 -05:00
Eduardo Quezada D'Ottone
6aabe58649
Merge branch 'battle_engine' into magician 2022-01-15 13:06:13 -03:00
Eduardo Quezada D'Ottone
80c1e11245 Merge branch 'BattleEngine' into BE_Instruct 
# Conflicts:
#	src/battle_script_commands.c
 2022-01-13 20:13:01 -03:00
ghoulslash
2b69b02724
Merge pull request #2017 from AsparagusEduardo/BE_forbiddenAssist 
Extrapolated Assist forbidden flags to Gen 8 moves
 2022-01-13 11:52:11 -05:00
LOuroboros
bee4019d22 Tweaked Protean's effect's InGame appearance 2022-01-11 19:52:51 -03:00
LOuroboros
352523403a
Fixed usage of B_MULTI_BATTLE_WHITEOUT 2022-01-09 14:57:45 -03:00
Eduardo Quezada D'Ottone
97baedbd5e
Merge pull request #1923 from WiserVisor/battle_engine 
Added Sky Drop to Battle Engine
 2022-01-07 18:14:40 -03:00
W1serV1ser
178c4c66ba Fixed gSideTimers typo 2022-01-04 12:38:50 -08:00
W1serV1ser
66faa6aa15 Follow Me/Rage Powder effect on target goes away once affected by Sky Drop 2022-01-04 12:33:31 -08:00
Eduardo Quezada D'Ottone
d433d67558 Extrapolated Assist forbidden flags to Gen 8 moves 2022-01-01 20:21:29 -03:00
Eduardo Quezada D'Ottone
5b54986e6b
Merge pull request #1980 from LOuroboros/multiBattles 
Multi battle updates
 2021-12-29 22:09:06 -03:00
Eduardo Quezada D'Ottone
ba43280a7c Refactored Instruct to use the regular forbidden move lookup table 2021-12-29 21:04:15 -03:00
LOuroboros
cc1a243145
Update src/battle_script_commands.c 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2021-12-28 12:18:44 -03:00
W1serV1ser
e0f7e7a2d9 Updated variable name in MOVEEND_SKY_DROP_CONFUSE 2021-12-27 12:10:38 -08:00
Eduardo Quezada D'Ottone
4d6f54e8d6
Merge pull request #2007 from ghoulslash/be/roleplay 
Update Role Play
 2021-12-25 11:37:57 -03:00
Eduardo Quezada D'Ottone
7bffe6d1d5
Merge pull request #2004 from ghoulslash/be/sports 
Add sport effects back
 2021-12-24 18:59:50 -03:00
LOuroboros
03205c995d
Update battle_script_commands.c 2021-12-24 01:59:40 -03:00
WiserVisor
8923ffb3af
Merge branch 'battle_engine' into battle_engine 2021-12-23 15:29:10 -08:00
W1serV1ser
58a5a9cbec Simplified skyDropTargets storage and made other minor improvements 
A lot of these changes are based on ghoulslash's version of Sky Drop.
 2021-12-23 15:27:11 -08:00
Eduardo Quezada D'Ottone
a725592a6b
Merge pull request #1999 from ghoulslash/be/moveeffect 
More battle-will-end checks on stat-changing damaging effects
 2021-12-23 20:23:16 -03:00
ghoulslash
b6b5d862f4 update role play mechanics 2021-12-23 08:37:11 -05:00
LOuroboros
cb44de13b3 B_NEW_MULTI_BATTLE_DEFEAT_CONDITION -> B_MULTI_BATTLE_WHITEOUT 2021-12-19 20:53:57 -03:00
Eduardo Quezada D'Ottone
4ab4250d5d
Merge branch 'battle_engine' into be/sports 2021-12-19 20:42:15 -03:00
LOuroboros
ffe35fbb06 Updated defeat condition on multi battles 2021-12-19 08:30:43 -03:00
Eduardo Quezada D'Ottone
a075cca448
Merge branch 'battle_engine' into fix-burmy 2021-12-18 13:38:12 -03:00
ghoulslash
31bbc4ddde prevent stat-raising damage effects if battle will end 2021-12-17 10:24:07 -05:00
Eduardo Quezada D'Ottone
aa2b2e6a70
Merge pull request #1929 from ultima-soul/battle_engine_sync 
Battle Engine Upstream Sync
 2021-12-09 20:02:45 -03:00
ultima-soul
a5afdac0ae Resolved review suggestions for upstream Battle Engine sync. 2021-12-08 12:08:16 -08:00
LOuroboros
a5659f3339 AI partners no longer get exp. 2021-12-04 23:00:57 -03:00
kleeenexfeu
e7321c22f2
Moxie spread move fix 2021-12-04 17:38:26 +01:00
ultima-soul
7369f60c06 Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync 2021-12-03 17:30:45 -08:00
LOuroboros
ac606364e9
Removed ITEM_ENIGMA_BERRY_E_READER usage 2021-12-03 15:44:12 -03:00
ghoulslash
5c52abd856 gen3 sport move functionality behind config 2021-11-23 21:20:32 -05:00
BuffelSaft
cca7ec8c58 Fix and rename GetMoveTargetType 
Change name to GetBattlerMoveTargetType and make it actually use the battlerId argument.
 2021-11-24 12:09:54 +13:00