BuffelSaft
70f0018c08
Partially implement Shell Trap
...
Doesn't play the animation when the trap triggers, but kinda works? May also be incredibly buggy, but I'm not interested in working on this move any further.
2021-11-22 14:14:41 +13:00
ultima-soul
a8f9a54787
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-11-21 10:41:32 -08:00
ultima-soul
3ed51d6d91
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-21 10:40:26 -08:00
BuffelSaft
bcaa17ffb3
Finish/tidy up Court Change
...
Use a macro to simplify timer and status updates, and swap things like reflectBattlerId to the opposing side - this is required for the effects to be properly swapped.
2021-11-21 17:20:45 +13:00
ghoulslash
37ab20e29c
fix wish
2021-11-20 16:49:04 -05: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
LOuroboros
a01fd2eb7a
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE
2021-11-15 12:47:26 -03:00
LOuroboros
cbb6639f8d
Fling tweaks
...
-Updated and renamed VARIOUS_JUMP_IF_FLING_FAILS (now VARIOUS_JUMP_IF_NO_FLING_POWER)
-Updated BattleScript_EffectFling following Smogon's description of Fling's effect.
-Refactored BattleScript_FlingMentalHerb thanks to GetMentalHerbEffect
-No need to define flingPower when its value is 0
-Forced the target to eat a berry that was flung at them by overwriting their item with the berry thrown and restoring their original item after its effect finishes.
-Added a preproc config for Klutz.
2021-11-15 12:40:10 -03:00
ghoulslash
940a165be7
merge w be
2021-11-13 09:09:15 -05: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
4e6a459b14
Optimized terrain timers
2021-11-06 19:46:52 -03:00
ghoulslash
41bf1dc2f4
merge w be
2021-11-06 10:40:57 -04: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
28e78cb6c4
Gen 8 moves initial commit
...
Full credit to Nunuchu42 and cfmnephrite for this code.
2021-11-04 19:50:54 +13:00
Eduardo Quezada D'Ottone
6ee2a3aba1
Merge branch 'BattleEngine' into booleanStandard
...
# Conflicts:
# src/battle_main.c
2021-11-03 20:44:25 -03:00
ghoulslash
48c29a9cd8
proper mirror armor sticky web targeting
2021-11-03 15:05:52 -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
ghoulslash
98b4b821dc
merge with be
2021-11-01 13:55:55 -04:00
ghoulslash
a1e64fce4f
handle simple beam, gastro acid
2021-11-01 13:50:57 -04:00
ghoulslash
28bc7dc14d
start ability
2021-10-29 22:32:19 -04:00
ghoulslash
204748e01a
fix recycle and harvest
2021-10-28 17:52:52 -04: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
28522f3ffb
Fixed Hyperspace Fury not breaking through protections
...
Also repositioned VARIOUS_JUMP_IF_SPECIES.
2021-10-28 12:09:44 -03:00
LOuroboros
8c35a68060
Quick syntax tweaks
2021-10-27 11:19:39 -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
Eduardo Quezada D'Ottone
382ec13492
Merge pull request #1752 from ghoulslash/quick_draw
...
Quick Draw
2021-10-22 22:39:03 -03:00
Eduardo Quezada D'Ottone
d0253640fb
Merge pull request #1739 from LOuroboros/primalReversionBE
...
Implemented Primal Reversion
2021-10-22 22:27:45 -03:00
ghoulslash
416c517e49
Merge pull request #1786 from Xavion3/damage_debug
...
Adds simulated damage to the debug menu
2021-10-19 12:14:38 -04:00
ghoulslash
eda99fcf29
Merge pull request #1742 from AsparagusEduardo/be_gStatuses4
...
Add gStatutes4
2021-10-19 08:45:47 -04:00
Xavion3
150dd7c633
Add damage information to the debug menus
2021-10-19 22:39:07 +11: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
5509ceea04
expand move target field
2021-10-16 16:10:45 -04:00
BuffelSaft
df2223a5bc
Merge pull request #1745 from LOuroboros/retaliate
...
Implemented Retaliate's effect
2021-10-16 22:49:32 +13:00
LOuroboros
3b6ceb1dfa
Turned Retaliate into a side timer
2021-10-16 06:04:04 -03:00
LOuroboros
3a25bce185
Turned Retaliate's effect into a side status
2021-10-15 06:03:48 -03:00
LOuroboros
1f97198267
Oops, I forgot to take the opponent's side into account
2021-10-15 05:02:14 -03:00
Eduardo Quezada D'Ottone
21837b659a
Merge branch 'battle_engine' into bug_bite
2021-10-14 19:46:50 -03:00
ghoulslash
a3d2bdc9cf
merge with be
2021-10-13 18:30:53 -04:00
GriffinR
def6cc8158
Label battle script macro arguments
2021-10-13 17:44:04 -04:00
GriffinR
fc15b0d5f0
Add controller buffer constants, finish misc battle doc
2021-10-13 16:21:39 -04:00
ghoulslash
3248bd796a
add quick draw
2021-10-12 21:49:18 -04:00
GriffinR
b0598b1aef
Clean up recorded_battle, add MOVE_IS_PERMANENT
2021-10-12 01:14:17 -04:00
LOuroboros
6c550cd749
Implemented Retaliate's effect
2021-10-11 03:19:21 -03:00
ghoulslash
06bcfea3b8
merge with be
2021-10-10 19:56:33 -04:00
Eduardo Quezada D'Ottone
cf6e3873b4
Moved Electrified to Status4.
2021-10-10 01:13:23 -03:00
LOuroboros
91a68cd5db
Implemented Primal Reversion
2021-10-09 00:36:41 -03:00
GriffinR
31b501e7eb
Start misc battle documentation
2021-10-08 16:39:46 -04:00
ghoulslash
4aeadd96c9
merge with be
2021-10-06 14:49:23 -04:00
ghoulslash
ee3a2c97ee
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into last_ball
2021-10-06 13:54:40 -04:00
GriffinR
739e7d3c31
Document summary screen sprite manager
2021-10-02 23:47:59 -04:00
ghoulslash
761006a164
merge with be
2021-09-26 19:19:32 -04:00
Eduardo Quezada D'Ottone
e87c170db0
Merge branch 'BattleEngine' into booleanStandard
...
# Conflicts:
# src/battle_main.c
# src/battle_script_commands.c
2021-09-23 18:20:35 -03:00
ghoulslash
2f69748e0d
merge with be
2021-09-23 14:38:01 -04:00
ghoulslash
33972b5493
merge with be
2021-09-23 12:04:13 -04:00
ghoulslash
3f34fec42f
change last ball graphic based on config. replace saveblock field with ewram field
2021-09-23 12:03:01 -04:00
Eduardo Quezada D'Ottone
d084d2a68d
Merge branch 'BattleEngine' into booleanStandard
...
# Conflicts:
# include/battle.h
# src/battle_main.c
# src/battle_script_commands.c
2021-09-22 23:42:00 -03:00
Eduardo Quezada D'Ottone
075c0299a1
Better names for Micle and Custap flags
2021-09-22 23:29:26 -03:00
ghoulslash
9bf2ffe459
fix lash out stat fell
2021-09-22 21:15:02 -04:00
ghoulslash
13062b5a8f
fix lash out, obstruct, and decorate
2021-09-22 09:43:40 -04:00
ghoulslash
fc84ebbd3e
redo prankster checks to handle assist
2021-09-22 08:06:42 -04:00
ghoulslash
0ea6c65b83
merge with be
2021-09-17 09:10:09 -04:00
ghoulslash
9d8672e3df
merge with be
2021-09-16 13:12:59 -04:00
ghoulslash
9c94eb6140
but it failed check for rototiller
2021-09-16 10:24:32 -04:00
ghoulslash
c4ce4c150d
fix eject pack
2021-09-14 15:38:16 -04:00
ghoulslash
95af97593b
fix some comment styling. fix throat spray for multi-target moves
2021-09-14 11:53:35 -04:00
ghoulslash
f3f26d1a6f
merge with be
2021-09-13 19:40:28 -04:00
ghoulslash
6915b029bd
fix echoed voice power boost
2021-09-09 11:15:58 -04:00
DizzyEggg
68c33895fd
Merge pull request #1622 from BuffelSaft/money-boost
...
Fix stacking effect on HOLD_EFFECT_DOUBLE_PRIZE
2021-09-06 11:32:53 +02:00
DizzyEggg
fa081d1fc5
Merge pull request #1618 from BuffelSaft/protect-like
...
Fix protect-like moves
2021-09-06 10:24:29 +02:00
ExpoSeed
5a5c257f68
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2021-09-02 21:43:20 -05:00
ghoulslash
7c53214dad
merge with be
2021-09-02 15:33:42 -04:00
BuffelSaft
13636f8691
Fix stacking effect on HOLD_EFFECT_DOUBLE_PRIZE
...
moneyMultiplier should only ever be 1, 2 or 4. This adds some flags to moneyMultiplier that prevent HOLD_EFFECT_DOUBLE_PRIZE and Happy Hour from infinitely increasing it.
2021-09-02 16:15:58 +12:00
BuffelSaft
3371773e5c
Move touchedProtectLike to protect structs
...
This makes more sense than putting it in DisableStruct.
2021-09-01 21:34:47 +12:00
BuffelSaft
ea6ce80ad4
Fix protect-like moves
...
Make Protect-like moves (King's Shield etc.) activate only if the attacker would've touched the target.
This does not handle Sucker Punch, because that's not working correctly with Protect currently and will need to be addressed separately.
2021-09-01 19:57:03 +12: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
ghoulslash
a2d885c0d4
merge with be
2021-08-12 14:48:58 -06:00
ghoulslash
d218322b2c
merge with be
2021-08-12 01:26:13 -04:00
ghoulslash
4ca6d76160
add bug bite
2021-07-25 14:55:52 -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
ghoulslash
c06029bc72
add last used ball
2021-06-25 13:37:59 -06:00
Xhyzi
c2bd046ea6
Shell Trap
2021-06-15 20:22:50 +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
ultima-soul
bca67ac683
Refactor Poke Ball code to not rely on Master Ball being the first item internally.
2021-06-11 18:22:50 -07:00
ExpoSeed
c8fc141287
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2021-06-10 11:54:20 -05:00
DizzyEggg
f27dcab784
Rage powder has powder moves qualities when forcing a target
2021-06-10 12:55:05 +02:00
MissingNoL
c876de5a5b
Done! Merge branch 'battle_engine' into Photon_Geyser
2021-06-05 17:40:06 -07:00
DizzyEggg
4b744374c8
Allow larger exp gains
2021-06-03 23:17:44 +02:00
MissingNoL
f30a9542ee
Problem: Photon Geyser is calculating as Shell Side Arm?? Needs: Poison effect, contact move for Shell Side Arm
2021-05-27 22:21:55 -07:00
ghoulslash
c356ffaed4
merge with be. fix null ptr check in GetBattleMoveSplit
2021-05-24 10:46:53 -06:00
ghoulslash
c3e28e9b1a
merge with be
2021-05-23 12:22:52 -06:00
ultima-soul
14a0303e2f
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-27 18:36:37 -07:00
GriffinR
9ea9ffde09
Add remaining multistring chooser constants
2021-04-03 11:49:06 -04:00
ghoulslash
d89e2c1775
merge with be
2021-04-02 08:55:54 -06:00
ghoulslash
a595b213b4
merge with be
2021-03-28 17:29:22 -06:00
ultima-soul
5bab9474dc
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-03-22 23:08:19 -07:00
PikalaxALT
925e68c03f
Update newly named fields
2021-03-15 15:22:41 -04:00
PikalaxALT
8d4dcb228a
More documentation in battle_main
2021-03-12 16:55:58 -05:00
