Commit Graph

240 Commits

Author SHA1 Message Date
Eduardo Quezada D'Ottone
a483899043
Merge branch 'dev' into symbiosis 2022-09-24 11:58:35 -03:00
Eduardo Quezada D'Ottone
47a50b3dac
Merge branch 'master' into weather_forms_fixes 2022-09-07 23:07:25 -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
Eduardo Quezada
eea718cfc6 Placeholder moves can't be used in battle. 2022-08-24 00:30:49 -04:00
Eduardo Quezada
56a2e91518 Updated move limitations 2022-08-23 22:40:04 -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
ghoulslash
6b84a9f0b3 merge w be 2022-07-17 12:40:43 -04:00
LOuroboros
aa5c6a3f01 Implemented affection-now-friendship mechanics 2022-06-22 00:18:01 -03:00
Sneed69
d0a2be9630 weather forms fixes and config 2022-05-22 03:20:48 +03:00
ghoulslash
07b0ce9737 add inner focus ability popup msg 2022-05-08 17:57:30 -04:00
AgustinGDLV
7b0154336d
Merge branch 'battle_engine' into symbiosis 2022-05-07 13:26:21 -07:00
AgustinGDLV
0cb6529ae2 functional but not perfect implementation 2022-05-06 14:53:16 -07:00
sneed
ef7cd3cdfe BattleScript_DefiantActivates rename 2022-05-06 11:15:24 +03:00
ExpoSeed
f50a406b18 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2022-03-22 12:56:23 -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
Eduardo Quezada D'Ottone
6aabe58649
Merge branch 'battle_engine' into magician 2022-01-15 13:06:13 -03:00
ExpoSeed
d6747527da Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2021-12-16 21:44:01 -06:00
BuffelSaft
50d0cd52e8 Clean up Corrosive Gas
Remove code and unused move effect.
2021-11-22 15:13:54 +13:00
BuffelSaft
d2eb5f0e61 Remove shell trap effect code
Left strings and animations as those were fine, but code was non-functional and fixing it was not trivial.
2021-11-22 14:46:47 +13:00
BuffelSaft
14a2e86313 Fix Scale Shot
Lowers defense and raises speed instead of just lowering defense now. Tested with Contrary and min/max speed/def.
2021-11-19 21:57:32 +13:00
BuffelSaft
98712e576e Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2 2021-11-19 17:48:11 +13:00
ghoulslash
940a165be7 merge w be 2021-11-13 09:09:15 -05:00
Eduardo Quezada D'Ottone
a7870dbef0
Merge branch 'battle_engine' into magician 2021-11-12 19:40:34 -03:00
BuffelSaft
e2599c2469 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1 2021-11-10 14:31:32 +13:00
ghoulslash
da6ec51fc2 merge w be 2021-11-06 10:43:35 -04:00
ghoulslash
41bf1dc2f4 merge w be 2021-11-06 10:40:57 -04:00
BuffelSaft
4007a8d1f8 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into relic_song 2021-11-06 11:52:51 +13:00
BuffelSaft
ee83d1142c Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1 2021-11-05 21:40:05 +13:00
BuffelSaft
6df3975fc6 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hunger_switch2 2021-11-05 14:32:33 +13:00
LOuroboros
22f7e81bef Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry 2021-11-04 12:25:26 -03:00
BuffelSaft
28e78cb6c4 Gen 8 moves initial commit
Full credit to Nunuchu42 and cfmnephrite for this code.
2021-11-04 19:50:54 +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
eeb40daede Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into pastel_veil2 2021-11-04 13:52:58 +13: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
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
f323e2c047 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into pastel_veil 2021-11-03 14:18:28 +13:00
LOuroboros
69b42de0d9 Implemented Mimicry
Thanks to AsparagusEduardo for helping me optimize RestoreBattlerOriginalTypes.
2021-11-02 14:44:55 -03:00
ghoulslash
ffcba355b0 merge w be 2021-11-02 10:36:08 -04: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
ghoulslash
98b4b821dc merge with be 2021-11-01 13:55:55 -04:00
ghoulslash
bc170f3a43 merge with be 2021-10-31 11:04:39 -04:00
BuffelSaft
47bfeaeecd Implement Gorilla Tactics
It's Choice Band but as an ability.
2021-10-30 18:31:44 +13:00
ghoulslash
28bc7dc14d start ability 2021-10-29 22:32:19 -04:00
ghoulslash
f342e7c590 merge with be 2021-10-28 17:03:10 -04:00
LOuroboros
82101d3581 Optimizations 2021-10-28 14:02:43 -03:00
Eduardo Quezada D'Ottone
382ec13492
Merge pull request #1752 from ghoulslash/quick_draw
Quick Draw
2021-10-22 22:39:03 -03:00
LOuroboros
d9b8e11a9c Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionBE 2021-10-19 07:47:42 -03:00
ghoulslash
a3d2bdc9cf merge with be 2021-10-13 18:30:53 -04:00
ghoulslash
3248bd796a add quick draw 2021-10-12 21:49:18 -04:00
ghoulslash
996301d5d3 add mirror armor 2021-10-12 18:04:34 -04:00