atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
8609 commits 2 branches 40 tags 617 MiB
Commit graph

8609 commits

This branch
This branch
All branches
Author SHA1 Message Date
LOuroboros
b64d506809 Made a function to lift Mimicry's effect 2021-11-04 12:20:31 -03:00
LOuroboros
4f251e6ec2 Moved VARIOUS_TRY_TO_REVERT_MIMICRY to VARIOUS_REMOVE_TERRAIN 2021-11-04 12:13:55 -03:00
ghoulslash
6b10801ee8 convert AI_IsabilityOnSide to bool 2021-11-04 10:43:33 -04:00
Jaizu
2728f13eed
Fix comment typo 2021-11-04 09:58:55 +01:00
BuffelSaft
b615bc6dcd
Merge pull request #1854 from AsparagusEduardo/BE_UndoForm 
Refactored UndoFormChange to make it more user friendly
 2021-11-04 17:30:55 +13:00
BuffelSaft
7d10097684 Replace IsTwoStrikesMove with FLAG_TWO_STRIKES 
Note that this flag does nothing until the Parental Bond PR is merged - it's just for the AI until then.
 2021-11-04 17:11:56 +13:00
BuffelSaft
a2574b55cc Fix dynamic move damage calculation 
Can't check effectiveness here without breaking the AI. After testing, it also appears that it doesn't need to be checked here after all.
 2021-11-04 16:09:28 +13:00
BuffelSaft
4a7ddb737b Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai_improvements 2021-11-04 15:51:11 +13:00
BuffelSaft
e930dae278 Remove ability pop up for Hunger Switch 
Morpeko should change form each turn without showing its ability.
 2021-11-04 15:40:26 +13:00
BuffelSaft
616be576fc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hunger_switch2 2021-11-04 15:29:38 +13:00
LOuroboros
b931e34172 Handled Mimicry's interaction with Steel Roller's effect 2021-11-03 23:23:28 -03:00
ghoulslash
060ae35c7c fix curse magic guard check 2021-11-03 21:53:28 -04:00
ghoulslash
012877bdc1 fix ai's def magic guard check 2021-11-03 21:49:46 -04:00
ghoulslash
4466fbd930 ai version of CanPoisonType, CanBePoisoned and IsAbilityOnSide 2021-11-03 21:36:33 -04:00
Eduardo Quezada D'Ottone
05850f0f65 Refactored UndoFormChange to make it more user friendly 2021-11-03 22:05:02 -03:00
ghoulslash
90ddc8d706
Merge pull request #1849 from BuffelSaft/pastel_veil2 
Add Pastel Veil, fix Corrosion and Poison Touch
 2021-11-03 21:01:28 -04:00
BuffelSaft
eeb40daede Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into pastel_veil2 2021-11-04 13:52:58 +13:00
ghoulslash
86ad65df76
Merge pull request #1675 from AsparagusEduardo/booleanStandard 
Using boolean for flags
 2021-11-03 19:52:52 -04:00
Eduardo Quezada D'Ottone
6ee2a3aba1 Merge branch 'BattleEngine' into booleanStandard 
# Conflicts:
#	src/battle_main.c
 2021-11-03 20:44:25 -03:00
LOuroboros
f6628e301f Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry 2021-11-03 20:43:33 -03:00
BuffelSaft
6132f9a9fe
Merge pull request #1750 from ghoulslash/mirror_armor 
Mirror Armor
 2021-11-04 11:43:59 +13:00
BuffelSaft
5a855db4ad Fix prototype of CanBePoisoned 2021-11-04 11:08:37 +13:00
LOuroboros
f0d7c75ec8 Syntax corrections 2021-11-03 17:48:04 -03:00
ghoulslash
48c29a9cd8 proper mirror armor sticky web targeting 2021-11-03 15:05:52 -04:00
ghoulslash
7e6e23005b fix clear body 2021-11-03 13:59:26 -04:00
LOuroboros
af6e72ecfe Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser 2021-11-03 08:56:01 -03:00
Blackforest92
b9c23f7c62 Update waterfall, trick room, & focus blast BG 2021-11-03 16:29:09 +07:00
BuffelSaft
5141e84296 Fix base stats 
Clean up mess from testing.
 2021-11-03 20:01:09 +13:00
BuffelSaft
6ce1f01b8c Hunger Switch and Aura Wheel 
Implement the ability Hunger Switch and the move Aura Wheel.
 2021-11-03 19:45:03 +13:00
BuffelSaft
18b87416d5 Fixes 
- Fix Sheer Force interaction (needed after adding | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN)
- Fix "X Transformed!" target
- Allow switching between both forms
- Allow form change if target is KO'ed
 2021-11-03 17:56:16 +13:00
BuffelSaft
74c85b5818 Implement Relic Song's form change 
Meloetta transforms into its pirouette form after using Relic Song, unless it has Sheer Force or the move has no effect. It also has a chance to put both targets to sleep.
 2021-11-03 17:23:33 +13:00
BuffelSaft
d33bcc335b Revert Poison Touch target check 
This would prevent Poison Touch activating if the target hurt itself.
 2021-11-03 14:49:14 +13:00
BuffelSaft
f323e2c047 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into pastel_veil 2021-11-03 14:18:28 +13:00
Eduardo Quezada D'Ottone
11e93aee69
Merge pull request #1848 from SBird1337/fix/ub 
[battle_debug] fix charbase overflow
 2021-11-02 21:24:46 -03:00
sbird
5bfb3096ad [battle_debug] fix charbase overflow 2021-11-02 23:53:03 +00:00
BuffelSaft
d99fd30e4d Looping battle script, correct message 
Testing in Sword showed that the pop up should happen once if two mons are cured, and that the correct message is "X was cured of its poisoning!"
 2021-11-03 11:51:20 +13:00
LOuroboros
69b42de0d9 Implemented Mimicry 
Thanks to AsparagusEduardo for helping me optimize RestoreBattlerOriginalTypes.
 2021-11-02 14:44:55 -03:00
ghoulslash
4c9f48e9d8
Merge pull request #1842 from AsparagusEduardo/be_Gen8ContestData 
Added Gen 8 contest data
 2021-11-02 12:50:45 -04:00
ghoulslash
592a1dab63 fix mirror armor setstatchanger, handle reflected stat blockage 2021-11-02 12:02:58 -04:00
ghoulslash
ffcba355b0 merge w be 2021-11-02 10:36:08 -04:00
BuffelSaft
4668e11765 Looping battlescript version 1 
Would be better if it simply updated the target, cured the status and returned I think, needs testing.
 2021-11-03 00:45:24 +13:00
BuffelSaft
95435b5f7f Pastel Veil switchin effect attempt 
Battle script isn't working for partner for some reason.
 2021-11-02 23:06:10 +13:00
BuffelSaft
40bced517a Pastel Veil blocks poison for whole side 
Tested vs Toxic, Toxic Thread and Sludge with 100% effect chance.
 2021-11-02 20:00:57 +13:00
BuffelSaft
1e3b3d482b
Merge pull request #1838 from Blackforest92/battle_engine 
Edit Spacial Rend and Hurricane background
 2021-11-02 17:11:47 +13:00
BuffelSaft
8af882348a Fix Parental Bond Super Fang 
Min damage should be 2
 2021-11-02 16:56:12 +13:00
BuffelSaft
b97a250acc
Merge pull request #1512 from ghoulslash/utility_umbrella 
Utility Umbrella
 2021-11-02 16:28:52 +13:00
Eduardo Quezada D'Ottone
10306d046c Fixed Steam Roller's define 2021-11-01 22:07:54 -03:00
Eduardo Quezada D'Ottone
8332bfae46 Gen 8 combo moves 2021-11-01 21:59:34 -03:00
Eduardo Quezada D'Ottone
c4aa2a1e92 Added Gen 8 contest data (minus combos), also fixed Bubble's category 2021-11-01 21:36:08 -03:00
ghoulslash
25f200d7ce
Merge pull request #1840 from LOuroboros/patch-2 
Fixed battlerId in Poison Touch's confusionSelfDmg check
 2021-11-01 11:39:51 -04:00