LOuroboros
a77f058146
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser
2021-10-28 14:24:43 -03:00
ghoulslash
34e966fdee
Merge pull request #1815 from LOuroboros/hyperspaceFury
...
Implemented Hyperspace Fury
2021-10-28 13:20:33 -04:00
LOuroboros
82101d3581
Optimizations
2021-10-28 14:02: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
ghoulslash
bebaded415
merge with be
2021-10-27 16:48:38 -04:00
LOuroboros
de157919b0
Added animations for Shell Side Arm
2021-10-27 11:14:17 -03:00
LOuroboros
d5b5090d52
Fixed BattleScript_EffectPhotonGeyser
2021-10-27 11:14:08 -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
GriffinR
fbf3bf2ce8
Replace 'mystery_event_club'
2021-10-26 22:43:56 -04: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
Eduardo Quezada D'Ottone
773c773bac
Merge remote-tracking branch 'RHH/battle_engine' into BE_ghostEscape
...
# Conflicts:
# include/constants/battle_config.h
2021-10-26 20:35:01 -03:00
GriffinR
b0c27a8521
Document ereader screen
2021-10-26 15:44:42 -04:00
GriffinR
d6571f2355
Merge pull request #1525 from GriffinRichards/doc-recmix
...
Document remainder of Record Mixing
2021-10-26 14:18:38 -04:00
ghoulslash
83c1170698
Merge pull request #1802 from LOuroboros/rapidSpin
...
Fixed Rapid Spin
2021-10-25 15:47:27 -04:00
LOuroboros
442376e75b
Replaced jumpifbyte with jumpifhalfword in a few BattleScripts
2021-10-25 16:36:17 -03:00
GriffinR
6dc3c9864c
Merge pull request #1520 from GriffinRichards/doc-random
...
Document random remaining symbols
2021-10-24 23:43:17 -04:00
GriffinR
ab80264921
Merge pull request #1519 from GriffinRichards/doc-mgift
...
Document Mystery Gift
2021-10-24 15:50:39 -04:00
GriffinR
7f3c529935
Document record mixing mail swap
2021-10-24 15:49:19 -04:00
Eduardo Quezada D'Ottone
f4ff76c8ae
MOVE_EFFECT_MEAN_LOOK now fails on ghost types.
2021-10-23 11:42:33 -03:00
Eduardo Quezada D'Ottone
76b6250104
Merge branch 'battle_engine' into plasmaFists
2021-10-23 11:06:34 -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
4c90cbe625
Repositioned the gMoveResultFlags check
2021-10-22 19:58:27 -03:00
LOuroboros
24876ac5e3
Small tweak for BattleScript_EffectRapidSpin
2021-10-22 07:21:31 -03:00
LOuroboros
dd82e051bd
Fixed Rapid Spin raising Speed even when the move fails
2021-10-22 07:21:10 -03:00
LOuroboros
a6315ffc75
Implemented Plasma Fists
2021-10-19 09:50:18 -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
GriffinR
24b4e898ad
More mauville_old_man clean up
2021-10-18 14:40:04 -04:00
GriffinR
7590bacec1
Label remaining symbols in field_specials
2021-10-18 02:14:29 -04:00
GriffinR
db8ce5d7f9
Clean up mauville_old_man, drop ScrSpecial prefix
2021-10-18 01:09:41 -04:00
ghoulslash
8dc77e6fe3
Merge pull request #1782 from LOuroboros/glare
...
Updated Glare
2021-10-17 22:11:33 -04:00
Eduardo Quezada D'Ottone
ead5c92469
Merge branch 'battle_engine' into PLG
2021-10-17 17:38:54 -03:00
LOuroboros
e7ad7319e3
Updated Glare
2021-10-17 12:03:35 -03:00
LOuroboros
d6304099ac
Review optimization
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-10-17 09:42:31 -03:00
LOuroboros
59cfbe55c1
Gave Grav Apple a move effect of its own
2021-10-17 09:27:35 -03:00
GriffinR
ece7ef3410
Correct usage of MysteryEvent to MysteryGift
2021-10-17 03:00:48 -04:00
GriffinR
3cd27acbea
Document wonder news
2021-10-17 02:09:31 -04:00
GriffinR
845a5e99cc
General mystery gift documentation, finish mystery gift client/server/scripts
2021-10-16 23:35:17 -04:00
GriffinR
e1900efe1e
Merge branch 'master' into doc-miscbattle
2021-10-15 22:46:43 -04:00
GriffinR
c02001c46d
Document mystery gift link scripts, general mystery gift
2021-10-15 12:05:06 -04:00
Eduardo Quezada D'Ottone
0a090616ef
Merge pull request #1765 from ghoulslash/shell_smash
...
Shell Smash Animation
2021-10-15 12:09:06 -03:00
BuffelSaft
e59be67023
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2021-10-15 16:25:11 +13:00
Eduardo Quezada D'Ottone
21837b659a
Merge branch 'battle_engine' into bug_bite
2021-10-14 19:46:50 -03:00
Eduardo Quezada D'Ottone
8be9e4ae1d
Merge pull request #1763 from BuffelSaft/battle_bond
...
Fix Battle Bond
2021-10-14 18:23:13 -03:00
ghoulslash
85ce72a4d0
add shell smash anim
2021-10-14 10:47:39 -04:00
BuffelSaft
85dd7ff63c
Fix Storm Drain/Dive bug
...
If Storm Drain is triggered by dive it should clear the attacker's semi-invulnerable status.
2021-10-14 16:40:18 +13:00
BuffelSaft
fc6e8f598c
Merge branch 'battle_engine' into battle_bond
2021-10-14 16:24:59 +13:00
BuffelSaft
bb8d0e3d6b
Fix Battle Bond
...
Battle Bond Greninja transforms only after a KO, and doesn't revert when switched out.
2021-10-14 16:18:11 +13:00
Eduardo Quezada D'Ottone
d689842689
Merge pull request #1657 from ghoulslash/rototiller
...
Rototiller Fix + MOVE_TARGET_ALL_BATTLERS
2021-10-13 22:45:50 -03:00
ghoulslash
7f2efb6619
format fixes, fix healing berries from printing message at full hp
2021-10-13 18:40:45 -04: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
ghoulslash
996301d5d3
add mirror armor
2021-10-12 18:04:34 -04:00
ghoulslash
bbd09fdcf7
add wandering spirit
2021-10-12 10:32:51 -04:00
GriffinR
f23e0beeba
Rename battle anim cmds, move its data, name remaining symbols
2021-10-11 13:18:21 -04:00
ghoulslash
6212a3c431
Merge pull request #1703 from AsparagusEduardo/fix_ConfuseBerries
...
Fixed confuse berries affecting the wrong battler.
2021-10-10 20:21:03 -04:00
ghoulslash
06bcfea3b8
merge with be
2021-10-10 19:56:33 -04:00
ghoulslash
fcada4fcad
handle rototiller + prankster
2021-10-10 19:54:17 -04:00
Eduardo Quezada D'Ottone
7798468ce9
Merge pull request #1738 from BuffelSaft/safety-googles
...
Fix Safety Googles
2021-10-10 18:34:20 -03:00
Eduardo Quezada D'Ottone
01f563cb5e
Fix infinite loop
2021-10-10 08:46:31 -03:00
BuffelSaft
8a7e6379b6
Merge pull request #1732 from ghoulslash/perish_song
...
Fix Soundproof cancelling out user's Perish Song
2021-10-10 22:55:20 +13:00
LOuroboros
91a68cd5db
Implemented Primal Reversion
2021-10-09 00:36:41 -03:00
BuffelSaft
07bdd2ffe6
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2021-10-09 15:18:51 +13:00
BuffelSaft
274e964d91
Fix Safety Googles
...
Fix typo and update gLastUsedItem before calling the safety goggles battle script.
2021-10-09 15:05:01 +13:00
GriffinR
31b501e7eb
Start misc battle documentation
2021-10-08 16:39:46 -04:00
ghoulslash
ce455ac7e7
merge with be
2021-10-08 07:44:32 -04:00
BuffelSaft
fbc4d7584e
Merge pull request #1610 from LOuroboros/primalAbilities
...
Implement Desolate Land, Primordial Sea and Delta Stream
2021-10-08 20:01:09 +13:00
ghoulslash
9a4e0cf757
magician fixes, handle edge cases
2021-10-07 17:37:47 -04:00
GriffinR
a2655ba9ab
Merge branch 'master' into doc-union
2021-10-07 16:10:35 -04:00
LOuroboros
359da5313e
Handled some edge cases
...
Gastro Acid, Worry Seed, Simple Beam, Core Enforcer and Transform
2021-10-07 01:53:20 -03:00
LOuroboros
7548e74013
Forgot to clear the primal weathers in some places
2021-10-07 00:43:23 -03:00
ghoulslash
1031703309
magician base functionality
2021-10-06 16:00:02 -04:00
ghoulslash
5f5df066d6
fix perish song + soundproof
2021-10-06 15:18:42 -04:00
ghoulslash
4aeadd96c9
merge with be
2021-10-06 14:49:23 -04:00
ghoulslash
391cfabcac
merge with be
2021-10-06 14:31:21 -04:00
ghoulslash
4382420dd2
merge with be
2021-10-06 13:32:59 -04:00
ghoulslash
1f4844c7f5
Merge pull request #1710 from AsparagusEduardo/BE_Struggle
...
Implemented modern effect of struggle with config
2021-10-06 09:27:10 -04:00
LOuroboros
2b32581c14
Fixed infinite loop
2021-10-06 09:27:33 -03:00
LOuroboros
b520fe5d89
Tweaked Strong Winds' animation
2021-10-06 08:38:19 -03:00
LOuroboros
fe5a0a7f04
Oopsie
2021-10-06 08:29:53 -03:00
LOuroboros
a646c3311b
Another set of fixes
...
The ability pop up is supposed to show as weather changing abilities try but fail to activate.
2021-10-06 08:20:50 -03:00
LOuroboros
0f2cc99f45
WEATHER_STRONG_WINDS modifier fix
...
MulByTypeEffectiveness was the right answer all along.
I also added a short pause to BattleScript_AttackWeakenedByStrongWinds before STRINGID_ATTACKWEAKENEDBSTRONGWINDS is printed.
2021-10-06 07:33:54 -03:00
LOuroboros
dc451167d1
More fixes
...
-Removed ability popup when Strong Winds weakens a SE Flying-type move
-Went back to the way I handled the dmg calculation for that originally
-Made sure to try to clear the primal weathers in a couple of other battle scripts
-Allowed Drought, Drizzle, Sand Stream and Snow Warning to activate but fail if WEATHER_STRONG_WINDS is in effect.
2021-10-06 05:54:28 -03:00
Eduardo Quezada D'Ottone
43d42c95cf
Terrain Pulse effect implemented
2021-10-04 22:45:37 -03:00
Eduardo Quezada D'Ottone
e2bf660c97
Secret Power field terrain animations
2021-10-04 21:51:51 -03:00
LOuroboros
dcefb523f8
Tweaks and fixes
...
-Fixed the Flying-type checks of WEATHER_STRONG_WINDS.
-Fixed the order of actions involving the printing of STRINGID_ATTACKWEAKENEDBSTRONGWINDS.
2021-10-04 08:12:41 -03:00
LOuroboros
b85b3094c8
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalAbilitiesDev
2021-10-03 07:05:56 -03:00
Eduardo Quezada D'Ottone
1e0ae9a154
Tabs to spaces.
2021-10-02 20:54:04 -03:00
Eduardo Quezada D'Ottone
57ea20bc6d
Implemented modern effect of struggle with config
2021-10-02 13:32:36 -03:00
LOuroboros
c464b1b5dd
STRINGID_ATTACKERBECAMEASHGRENINJA -> STRINGID_ATTACKERBECAMEASHSPECIES
2021-10-01 23:12:59 -03:00
LOuroboros
f3ded43a88
Implemented Battle Bond
2021-10-01 22:49:17 -03:00
Eduardo Quezada D'Ottone
7287560521
Fixed confuse berries affecting the wrong battler.
2021-10-01 18:28:51 -03:00
LOuroboros
f691769647
Fixed Def stat reduction
2021-10-01 06:29:21 -03:00
LOuroboros
a506bf03c6
Corrected Flower Veil check
2021-10-01 02:14:46 -03:00
LOuroboros
d7e651696b
Even more fixes
...
-Changed the way in which Gulp Missile checks for a fainted opponent, just in case the reason why the attacker's defense wasn't being lowered is that the script was falling into BattleScript_GulpMissileNoSecondEffectGulping
-Took into account max Defense stat stage, because I forgot to do that too.
-Slightly changed the Defense reduction code, just in case.
-Fixed the text string that was printed. Gulp Missile doesn't raise a stat, after all.
-Fixed the script that was being called if the attacker has Clear Body, and also added jumps for Full Metal Body, White Smoke and Flower Veil.
2021-09-30 10:37:49 -03:00
Pokestia
38a4dea402
Rename Battle Weather flags
2021-09-30 12:08:20 +02:00
LOuroboros
0389dbf9f2
More fixes
...
-Removed IsBattlerAlive check for case ABILITY_GULP_MISSILE in ABILITYEFFECT_MOVE_END_ATTACKER. Turns out Cramorant can change form even on single wild battles.
-Added a check for IsBattlerAlive in the case ABILITY_GULP_MISSILE of ABILITYEFFECT_MOVE_END, because otherwise, for whatever reason, the user was trying to trigger the Gulping effect even in its base form.
-Set the stat to change for the Gulping effect from within the battle script. The rest of the effect is handled there, so may as well.
-Fixed the check for case ABILITY_GULP_MISSILE in ABILITYEFFECT_MOVE_END_ATTACKER. Apparently, a silent species change was happening because of the order of the checks. Thanks to AsparagusEduardo for pointing this one out.
-Fixed the secondary effect of a target's Gulp Missile affecting an attacker that has fainted.
-Fixed the Defense reduction of the Gulping effect bypassing Clear Body.
2021-09-29 23:18:22 -03:00
Pokestia
e699965332
Use compact weather macros
2021-09-29 17:45:39 +02:00
LOuroboros
a49ea33dd0
A lot of fixes
...
-Fixed Gulp Missile's activation. Its effects were happening even if the conditions weren't actually met in battle.
-Fixed Gulp Missile activating if the only/last target has already fainted.
-Fixed Gulp Missile's Gorging animation, though it still uses Tackle's.
-Fixed Gulp Missile's Gorging attack affecting an opponent with Magic Guard.
-Fixed Gulp Missile changing Cramorant's form if Surf failed.
2021-09-27 08:57:09 -03:00
ghoulslash
761006a164
merge with be
2021-09-26 19:19:32 -04:00
LOuroboros
872d2a7008
Made this build again
2021-09-25 22:33:07 -03:00
LOuroboros
1b039062da
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile
2021-09-25 22:20:34 -03:00
GriffinR
a66d7e1b43
Document some single-remaining symbols
2021-09-24 17:14:20 -04:00
Syreldar
4c05520bf3
Fixed Retaliate's naming.
2021-09-24 16:02:26 +02:00
ghoulslash
2f69748e0d
merge with be
2021-09-23 14:38:01 -04:00
ghoulslash
94ec25319f
syntax fixes. Use BlocksPrankster for perish song battle script
2021-09-23 14:35:37 -04:00
ghoulslash
d4a153bf14
Update data/battle_scripts_1.s
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-09-23 12:21:16 -06:00
BuffelSaft
530998c4b7
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike
2021-09-23 16:41:35 +12:00
BuffelSaft
2f03ac31b9
Multihit refactor and Parental Bond
...
Port multihit system from the CFRU, implement Parental Bond, refactor certain moves as required and implement all remaining multi hit moves except Dragon Darts.
2021-09-23 14:31:21 +12:00
Eduardo Quezada D'Ottone
2c66aa84b6
Merge pull request #1378 from ghoulslash/gen8_move_effects
...
Several Gen 8 Move Effects
2021-09-22 22:48:29 -03:00
ghoulslash
d738297f24
merge with be
2021-09-22 16:26:09 -04:00
ghoulslash
3559a1b8e6
fix prankster + magic coat
2021-09-22 16:09:23 -04:00
ghoulslash
8cc0bb6ac0
Merge pull request #1652 from BuffelSaft/multi-hit-resist-berry
...
Fix multihit moves vs damage reducing berries
2021-09-22 09:42:53 -06:00
ghoulslash
13062b5a8f
fix lash out, obstruct, and decorate
2021-09-22 09:43:40 -04:00
ghoulslash
80a48de702
ally cannot block prankster + perish song
2021-09-21 11:54:59 -04:00
ghoulslash
32d19a9b19
syntax fixes. add B_PRANKSTER_DARK_TYPES check to perish song
2021-09-20 21:36:10 -04:00
ghoulslash
0ea6c65b83
merge with be
2021-09-17 09:10:09 -04:00
ghoulslash
faa963fd04
merge with be
2021-09-17 09:07:38 -04:00
ghoulslash
b916d7991c
merge with be
2021-09-16 21:52:29 -04:00
ghoulslash
e756b0accc
merge with be
2021-09-16 21:41:29 -04:00
ghoulslash
af8d86f0c9
merge with be
2021-09-16 13:33:35 -04: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
ghoulslash
2067f563cd
cannot block your own prankster elevated perish song
2021-09-16 11:47:05 -04:00
ghoulslash
aeafd9e222
perish song + prankster interaction
2021-09-16 11:34:01 -04:00
ghoulslash
9c94eb6140
but it failed check for rototiller
2021-09-16 10:24:32 -04:00
ghoulslash
85f3982fb9
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into prankster
2021-09-15 17:52:45 -04:00
ghoulslash
845e333ba1
fix electric/misty terrain interactions with yawn/rest failures
2021-09-15 17:11:42 -04:00
ghoulslash
aa475ab300
merge with be
2021-09-15 16:42:23 -04:00
ghoulslash
0bca01cb74
mental herb fixes
2021-09-15 12:56:58 -04:00
ghoulslash
b85586a33a
merge with be
2021-09-15 12:54:39 -04:00
ghoulslash
60713a8f2d
fix room service activation msg, stat target
2021-09-14 12:50:36 -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
BuffelSaft
7d3980de58
Fix multihit moves vs damage reducing berries
...
The extra waitmessage command is ugly but appears to be needed - if it's moved before the printstring, the message isn't displayed long enough on single hit moves.
2021-09-12 18:33:04 +12:00
ghoulslash
0cd7f3ffcd
Merge pull request #1635 from rh-hideout/DizzyEggg-galvanize_explosion
...
fix galvanize explosion + lightning rod
2021-09-09 12:04:42 -06:00
ghoulslash
9d3f906fda
Merge pull request #1537 from DizzyEggg/intimidate_popup
...
Fix lag caused by ability pop-up while it's set to False
2021-09-09 09:34:50 -06:00
ghoulslash
b8a71cabd1
merge with be
2021-09-09 09:44:18 -04:00
DizzyEggg
decf65a025
Merge pull request #1580 from ghoulslash/water_bubble
...
Water Bubble Prevents Burn
2021-09-08 20:00:45 +02:00
DizzyEggg
6a8f55dabf
fix galvanice explosion
2021-09-08 12:38:46 +02:00
BuffelSaft
a4b630e6b5
Fix MOVE_EFFECT_REMOVE_STATUS
...
Wake-Up Slap and Sparkling Aria now print the correct message when the target is cured.
Also, fix Ice Hammer's effect chance.
2021-09-07 16:34:32 +12:00
ghoulslash
e93ad2e255
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into water_bubble
2021-09-06 09:24:28 -04:00
ghoulslash
949c4ef63b
add ability popup
2021-09-06 09:24:15 -04:00
DizzyEggg
cdec3077b2
Merge pull request #1630 from BuffelSaft/disguise2
...
Fix many Disguise bugs
2021-09-06 10:32:37 +02:00
BuffelSaft
bdbb4b5f7e
Fix many Disguise bugs
...
Use an unused hitmarker flag to indicate that an HP change shouldn't break Disguise.
2021-09-06 18:27:42 +12:00
ghoulslash
933696b3cd
merge with be
2021-09-03 17:41:00 -04:00
ghoulslash
79f39a1fd0
fix eject button
2021-09-03 14:56:36 -04:00
ghoulslash
5c5276b04d
red card fixes
2021-09-03 14:29:28 -04:00
ghoulslash
93e2e09148
fix terrain seeds. create generic CompareStat function
2021-09-03 12:17:38 -04:00
ghoulslash
6ce1227447
fix throat spray bugs. move shell bell, throat spray etc to life orb moveend case
2021-09-03 11:05:11 -04:00
ghoulslash
7c53214dad
merge with be
2021-09-02 15:33:42 -04:00
ultima-soul
a10a02a536
Merge pull request #1221 from ghoulslash/battle_engine
...
Implement Pickpocket
2021-09-02 11:33:34 -07:00
LOuroboros
69b7910f47
Gave an entrance animation to Delta Stream
2021-08-31 00:15:17 -03:00
LOuroboros
0a38054925
Print STRINGID_ATTACKWEAKENEDBSTRONGWINDS properly
2021-08-30 21:21:07 -03:00
LOuroboros
216d8f0608
Solved game freezing issue
...
My approach with BattleScript_AttackWeakenedByStrongWinds was incorrect and thus caused the game to freeze when Battle Scene is enabled, so I resorted to printing the string directly, which I don't like because there is no pauses between `attackstring` and `STRINGID_ATTACKWEAKENEDBSTRONGWINDS`.
2021-08-27 18:28:34 -03:00
LOuroboros
9e4f33d09e
Implemented Desolate Land, Primordial Sea and Delta Stream
2021-08-27 17:56:43 -03:00
LOuroboros
554210c5e3
Removed trailing spaces in the most relevant files
...
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include *.s --include *.inc --include *.txt * | xargs sed -i 's/\s\+$//g'
Credits to Grant Murphy from Stack Overflow.
2021-08-24 19:59:32 -03:00
GriffinR
dfdcfc1568
Document remaining functions in cable_club
2021-08-15 16:22:15 -04:00
ghoulslash
85f98300ff
use B_WAIT_TIME_SHORT and B_WAIT_TIME_LONG
2021-08-12 14:14:51 -06:00
ghoulslash
0bbbd1e7a9
fix electric/misty yawn/rest interactions
2021-08-12 14:08:41 -06:00
ghoulslash
c7c0fbc296
merge with be, make AI CanBeStatused functions separate from general util ones
2021-08-12 13:37:53 -06:00
ghoulslash
d218322b2c
merge with be
2021-08-12 01:26:13 -04:00
ultima-soul
02c9e040df
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-08-11 16:33:10 -07:00
LOuroboros
b4c4650186
Corrected inconsistent flag label spelling
2021-08-05 17:26:03 -03:00
GriffinR
44cd9eed6b
Add align directives to all marts
2021-08-04 11:50:33 -04:00
ghoulslash
ab529b4e89
add stuff cheeks
2021-07-27 10:31:48 -06:00
LOuroboros
f1195e1884
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile
2021-07-27 09:08:52 -03: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
fd61770c34
water bubble prevents burn
2021-07-25 07:53:44 -06:00
ghoulslash
72d346fa46
Merge pull request #1560 from rh-hideout/DizzyEggg-patch-3
...
Fix White Smoke affecting Shell Smash's def drop
2021-07-24 07:14:08 -06:00
GriffinR
06351bf63c
Remove address comments
2021-07-20 15:18:31 -04:00
ghoulslash
a29c9f9339
Merge pull request #1569 from LOuroboros/cotton_down
...
Fixed Cotton Down
2021-07-13 11:06:59 -06:00
ghoulslash
ebc187c16d
Merge pull request #1536 from DizzyEggg/gravity
...
Fix Gravity's animation
2021-07-13 10:54:45 -06:00
LOuroboros
02eace4574
Fixed Cotton Down
...
It will no longer affect fainted 'mons.
2021-07-13 13:54:33 -03:00
GriffinR
72bb2bd160
Merge pull request #1474 from GriffinRichards/clean-miragetower
...
Clean up Mirage Tower
2021-07-10 23:26:41 -04:00
DizzyEggg
34f869ef40
Fix White Smoke affecting Shell Smash's def drop
2021-07-06 10:37:17 +02:00
GriffinR
0f538102d9
Add local id constants for C
2021-07-05 13:54:43 -04:00
GriffinR
d2701b51ab
Combine battle script labels, add EFFECT comments
2021-07-02 15:37:59 -04:00
GriffinR
64d06f4c8f
Condense battle AI scripts, minor clean up
2021-07-02 02:46:01 -04:00
GriffinR
8f43d1ebeb
Document smart shopper TV show
2021-07-02 01:45:23 -04:00
GriffinR
10886a586b
Clean up mirage tower
2021-07-01 23:46:15 -04: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
SphericalIce
0a94dba4a7
Rename item script labels to fit the established name scheme
2021-06-13 13:21:23 +01:00
MissingNoL
32c8de5eca
Finished!
2021-06-12 21:23:56 -07:00
MissingNoL
721dbe9178
Implemented all PLG effects
2021-06-12 18:01:35 -07:00
MissingNoL
610b18bfdb
Implemented Double Iron Bash's effect
2021-06-12 14:27:50 -07:00
MissingNoL
beb126b534
Implemented Zippy Zap's effect
2021-06-12 13:58:54 -07:00
ExpoSeed
3ed06c2cc2
Remove remaining grey and replace with gray
2021-06-10 11:36:10 -05:00
DizzyEggg
59ea75f99f
Fix Ability-popup lag
2021-06-08 12:56:38 +02:00
DizzyEggg
e2f14d43db
Fix Gravity's animation
2021-06-08 12:13:40 +02:00
LOuroboros
588b3638d3
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into inner_focus
2021-06-07 19:22:20 -03:00
LOuroboros
8726107d42
Removed BattleScript_FlinchPrevention
...
Also reverted a nonsensical change in SetMoveEffect's case MOVE_EFFECT_FLINCH.
2021-06-07 19:18:15 -03:00
ultima-soul
092f02f119
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-06-07 12:00:23 -07:00
MissingNoL
bfc66a21cc
gBattlescriptCurrInstr[3] is not reading species parameter
2021-06-06 19:14:11 -07:00
MissingNoL
c876de5a5b
Done! Merge branch 'battle_engine' into Photon_Geyser
2021-06-05 17:40:06 -07:00
ultima-soul
6edec5bc3d
Merge pull request #1437 from LOuroboros/oblivious
...
Tweaked Oblivious
2021-06-04 16:51:38 -07:00
LOuroboros
b552db7193
Tweaked the Oblivious immunities
...
Pokémon that are infatuated or taunted and obtain Oblivious through Skill Swap will now be healed of said conditions and a text string signaling it will be printed.
2021-06-04 19:23:07 -03:00
ultima-soul
2813b4f9bf
Merge pull request #1519 from DizzyEggg/flameburst
...
Fix FlameBurst
2021-06-03 09:30:50 -07:00
LOuroboros
b215b44951
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into clanging_scales
2021-06-03 05:09:14 -03:00
DizzyEggg
85ff866998
Fix FlameBurst
2021-06-03 09:50:43 +02:00
ultima-soul
b7f9009c1e
Merge pull request #1515 from DizzyEggg/battle_engine
...
Get rid of SOUND_PAN_ATTACKER in launchtemplate
2021-06-02 23:45:12 -07:00
LOuroboros
a60fd31b9f
Added the MOVE_EFFECT_CERTAIN arg to BattleScript_EffectAttackerDefenseDownHit
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-06-02 16:42:02 -03:00
BuffelSaft
2a6b989c92
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into body-press
2021-06-02 12:41:28 +12:00
LOuroboros
c21a00a5d1
Replaced magic numbers with constants in BattleScript_NotAffectedAbilityPopUp
2021-06-01 18:20:33 -03:00
LOuroboros
d48a6e00d4
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into oblivious
2021-06-01 18:15:01 -03:00
DizzyEggg
dd88be659c
Get rid of SOUND_PAN_ATTACKER in launchtemplate
2021-06-01 13:44:02 +02:00
DizzyEggg
72b7cb2dad
Merge pull request #1474 from LOuroboros/overdrive
...
Fixed Overdrive's animation
2021-06-01 13:33:11 +02:00
MissingNoL
0f09055cfe
Fixes and added Poison chance to Shell Side Arm (needs contact on physical)
2021-05-28 11:11:03 -07: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
5840b1f0ed
utility umbrella effect
2021-05-24 09:52:45 -06:00
ghoulslash
c3e28e9b1a
merge with be
2021-05-23 12:22:52 -06:00
LOuroboros
9b46b6fb45
pause 0x40 -> pause B_WAIT_TIME_LONG
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-05-22 16:34:39 -03:00
LOuroboros
8cbdde3fba
waitmessage 0x40 -> waitmessage B_WAIT_TIME_LONG
2021-05-21 20:22:04 -03:00
LOuroboros
1bd451e232
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into 2turn_move_tweaks
2021-05-21 20:21:51 -03:00
ExpoSeed
6a977bdbfc
Document second parameter of playbgm
2021-05-21 15:08:00 -05:00
GriffinR
c8be6a1fbb
Remove leftover berry descriptions
2021-05-17 03:06:02 -04:00
GriffinR
65fd334256
Name map groups
2021-05-11 10:16:04 -05:00
LOuroboros
95d41524a2
Implemented Clanging Scales' effect
2021-05-09 18:20:03 -03:00
Flametix
a8fab62c89
Fix Substitute typo
2021-05-06 20:49:04 -04:00
LOuroboros
64a86d0285
Swapped launchtemplate calls with createsprite calls
2021-05-04 15:36:00 -03:00
ultima-soul
e864c39a5d
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync
2021-05-04 10:04:35 -07:00
ghoulslash
22fc9733e5
Merge pull request #1480 from BuffelSaft/big_root_fix
...
Make Big Root affect absorb moves
2021-05-04 09:32:18 -06:00
BuffelSaft
5d177f0a15
Make Big Root affect absorb moves
...
Big Root should increase the HP recovered by Absorb, Giga Drain etc.
2021-05-04 23:20:22 +12:00
LOuroboros
fa0d3a351e
Fixed Overdrive's animation
2021-05-02 20:10:48 -03:00
ultima-soul
56fc420187
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-28 21:34:30 -07:00
GriffinR
f7a699c686
Merge pull request #1421 from GriffinRichards/doc-tvrecordmix
...
Document TV
2021-04-29 00:25:01 -04: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
aad090e154
Document TV
2021-04-26 12:35:35 -04:00
GriffinR
bc9fc38254
Misc contest cleanup
2021-04-22 15:51:04 -04:00
GriffinR
dbe24f0baa
Clean up contest_painting
2021-04-21 20:04:12 -04:00
GriffinR
09a9efd5c5
Merge pull request #1398 from GriffinRichards/doc-field
...
Document field
2021-04-10 13:05:51 -04:00
GriffinR
4a1cfbead2
Document remaining overworld
2021-04-06 16:55:43 -04:00
GriffinR
802d2b2f0f
Label Kyogre/Groudon anims
2021-04-06 03:46:19 -04:00
GriffinR
00c3044c96
Clarify Groudon/Kyogre/Rayquaza gfx names
2021-04-06 02:38:15 -04:00
GriffinR
b6711441f5
Fix AI Guard Spec use, and Specs->Spec
2021-04-03 15:18:17 -04:00
GriffinR
f4d8a91ba4
Misc battle script cleanup
2021-04-03 14:07:31 -04:00
GriffinR
9ea9ffde09
Add remaining multistring chooser constants
2021-04-03 11:49:06 -04:00
LOuroboros
480e6a1ffc
Tweaked Ability PopUp for Inner Focus
2021-04-02 21:04:04 -03:00
