ghoulslash
6b84a9f0b3
merge w be
2022-07-17 12:40:43 -04:00
sneed
60d7d8f97e
Initial Commit
2022-05-03 03:38:44 +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
WiserVisor
8923ffb3af
Merge branch 'battle_engine' into battle_engine
2021-12-23 15:29:10 -08: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
ff60882b29
Requested changes
2021-11-23 11:04:39 +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
42b8f18cb1
Remove Corrosive Gas code
...
This was not working at all in testing, so it can be done by a separate PR later.
2021-11-22 14:35:01 +13:00
ultima-soul
3ed51d6d91
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-21 10:40:26 -08:00
W1serV1ser
c2f81cd5f5
Added Sky Drop
2021-11-20 11:44:48 -08: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
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
Eduardo Quezada D'Ottone
ae8de0f07a
Merge branch 'BattleEngine' into BE_TerrainMoves
...
# Conflicts:
# data/battle_scripts_1.s
# include/constants/battle_move_effects.h
# src/battle_util.c
2021-11-06 10:44:05 -03:00
BuffelSaft
5acebe32aa
Merge pull request #1817 from LOuroboros/photonGeyser
...
Implemented Photon Geyser and Shell Side Arm
2021-11-06 16:04:53 +13: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
LOuroboros
5f458c9cd3
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser
2021-11-05 10:58:53 -03: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
28e78cb6c4
Gen 8 moves initial commit
...
Full credit to Nunuchu42 and cfmnephrite for this code.
2021-11-04 19:50:54 +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
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
Eduardo Quezada D'Ottone
f3013d8ee9
Standarized Solarbeam into Solar Beam
2021-11-01 18:36:35 -03:00
LOuroboros
a77f058146
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser
2021-10-28 14:24:43 -03:00
LOuroboros
fc7f1acf20
Merge branch 'Photon_Geyser' of https://github.com/MissingNoL/pokeemerald-expansion into photonGeyser
2021-10-27 11:13:59 -03:00
LOuroboros
1ab8c84f41
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hyperspaceFury
2021-10-26 21:23:21 -03:00
LOuroboros
a6315ffc75
Implemented Plasma Fists
2021-10-19 09:50:18 -03:00
Eduardo Quezada D'Ottone
ead5c92469
Merge branch 'battle_engine' into PLG
2021-10-17 17:38:54 -03:00
LOuroboros
59cfbe55c1
Gave Grav Apple a move effect of its own
2021-10-17 09:27:35 -03:00
ghoulslash
391cfabcac
merge with be
2021-10-06 14:31:21 -04:00
Eduardo Quezada D'Ottone
43d42c95cf
Terrain Pulse effect implemented
2021-10-04 22:45:37 -03:00
Eduardo Quezada D'Ottone
57ea20bc6d
Implemented modern effect of struggle with config
2021-10-02 13:32:36 -03:00
ghoulslash
761006a164
merge with be
2021-09-26 19:19:32 -04:00
Syreldar
4c05520bf3
Fixed Retaliate's naming.
2021-09-24 16:02:26 +02:00
ghoulslash
c2e0990aab
fix some merge conflicts
2021-09-16 13:29:36 -04:00
ghoulslash
9d8672e3df
merge with be
2021-09-16 13:12:59 -04:00
ExpoSeed
0f99d9d4c6
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2021-08-30 13:26:40 -05:00
ultima-soul
02c9e040df
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-08-11 16:33:10 -07:00
ghoulslash
ab529b4e89
add stuff cheeks
2021-07-27 10:31:48 -06:00
ghoulslash
c914ed8572
fix sucker punch, surging strikes, obstruct, and snipe shot
2021-07-25 09:38:54 -06:00
ghoulslash
a37d4c3da9
merge with be, give life dew jungle healing effect
2021-07-25 08:22:05 -06:00
BuffelSaft
4c18cb7fe7
Remove EFFECT_THAW_HIT
2021-06-19 11:49:00 +12:00
Xhyzi
c2bd046ea6
Shell Trap
2021-06-15 20:22:50 +02:00
Xhyzi
155e9b6332
Court Change
2021-06-15 20:14:10 +02:00
Xhyzi
271f19e6cb
Terrain Pulse
2021-06-15 20:01:57 +02:00
Xhyzi
0202b75822
Beak Blast
2021-06-15 19:57:21 +02:00
Xhyzi
7799e49e3a
Corrosive Gas
2021-06-15 19:45:24 +02:00
Xhyzi
e7ec4df70b
Rising Voltage
2021-06-15 17:51:59 +02:00
Xhyzi
ee3f3eb78f
Meteor Beam
2021-06-15 17:06:21 +02:00
Xhyzi
62525516a4
Scale Shot
2021-06-15 16:50:19 +02:00
Xhyzi
60ce39543e
Expanding Force
2021-06-15 16:29:06 +02:00
