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
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
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
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
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
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
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
LOuroboros
02eace4574
Fixed Cotton Down
...
It will no longer affect fainted 'mons.
2021-07-13 13:54:33 -03:00
DizzyEggg
34f869ef40
Fix White Smoke affecting Shell Smash's def drop
2021-07-06 10:37:17 +02:00
GriffinR
d2701b51ab
Combine battle script labels, add EFFECT comments
2021-07-02 15:37:59 -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
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
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
59ea75f99f
Fix Ability-popup lag
2021-06-08 12:56:38 +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
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
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
c356ffaed4
merge with be. fix null ptr check in GetBattleMoveSplit
2021-05-24 10:46:53 -06:00
ghoulslash
5840b1f0ed
utility umbrella effect
2021-05-24 09:52:45 -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
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
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
ultima-soul
14a0303e2f
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-27 18:36:37 -07: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
ghoulslash
d89e2c1775
merge with be
2021-04-02 08:55:54 -06:00
GriffinR
a836bd1085
Add missing trainer constant use
2021-04-02 02:17:36 -04:00
GriffinR
87430a1ebc
Add WAIT_TIME battle script constants
2021-04-02 02:16:01 -04:00
GriffinR
c9d3b26ff7
Label miss string indexes
2021-04-02 02:12:46 -04:00
LOuroboros
ed74430d26
Added a variation of BattleScript_NotAffected
...
This one triggers the Ability PopUp.
2021-03-31 23:33:51 -03:00
GriffinR
7a5c6d4d86
Standardize Friendship/Happiness
2021-03-27 17:27:20 -05:00
ultima-soul
5bab9474dc
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-03-22 23:08:19 -07:00
BuffelSaft
7d237d8ff6
Implement Body Press' effect
...
Body Press calculates damage using the user's defense stat instead of its attack. Also adds a special variant of the effect that uses the special defense stat.
2021-03-16 22:56:44 +13:00
Eduardo Quezada D'Ottone
292993e360
Merge pull request #1338 from ghoulslash/ripen
...
Add Ripen and Finish Gen4 Berries
2021-03-13 11:16:42 -03:00
LOuroboros
68980cf18c
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile
2021-03-10 03:58:21 -03:00
ExpoSeed
685c8283ed
Merge pull request #1411 from BuffelSaft/Batte_Engine_Only
...
Fix Spiky Shield/Jump Kick freeze
2021-03-08 17:24:36 -06:00
Evan
2ccdf1d89e
merge with be. magic guard checks
2021-03-03 09:21:06 -07:00
Evan
b130396c0e
merge with be
2021-03-01 17:05:10 -07:00
ultima-soul
e5fa583a08
Merge pull request #1334 from ghoulslash/gen8_abilities
...
More Gen 8 Abilities
2021-03-01 10:40:09 -08:00
Evan
6cb8c6309a
merge with be
2021-03-01 11:28:51 -07:00
Evan
55b8538f68
merge with be
2021-03-01 11:22:37 -07:00
BuffelSaft
2b90c0b945
Fix Spiky Shield/Jump Kick bug
...
Spiky Shield no longer tries to hurt a Pokemon that has already fainted. Previously this would freeze the game if Jump Kick recoil fainted a Pokemon due to the target using Spiky Shield.
2021-02-19 13:57:29 +13:00
LOuroboros
43d6340b92
Corrected the order of actions in BattleScript_FirstChargingTurn
2021-02-08 17:51:46 -03:00
Evan
0483114a05
merge and some fixes
2021-02-02 11:45:15 -07:00
Evan
f4d4cf262e
fix screen cleaner, curious medicine, as one
2021-02-02 09:00:07 -07:00
ultima-soul
2a20d50904
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-02-01 15:54:08 -08:00
Evan
f428e5e2dc
some quick claw/custap berry fixes
2021-01-31 23:31:27 -07:00
Evan
c009b51ae8
add grassy glide, misty explosion, steel roller, obstruct, behemoth, decorate, snipe shot
2021-01-28 13:27:00 -07:00
Evan
a37acb8345
coaching, lash out, burning jealousy
2021-01-28 12:21:11 -07:00
Evan
dd51edd881
add eerie spell, surging strikes, jungle healing
2021-01-28 10:51:00 -07:00
GriffinR
4eca05ccf5
Document remainder of battle_controllers.c
2021-01-22 02:48:22 -05:00
Evan
4611c71bd1
merge with be
2021-01-21 08:55:14 -07:00
Evan
39139323f6
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into zmove
2021-01-20 17:36:37 -07:00
Evan
8ec12c665c
merge with be
2021-01-20 17:36:13 -07:00
Evan
e61309dce6
merge with be
2021-01-20 17:34:24 -07:00
Evan
16d54b6d32
merge with be, add form checks to CanBattlerGetOrLoseItem
2021-01-20 14:28:03 -07:00
Evan
a49b5d1ad0
prankster updated to gen 7
2021-01-16 16:14:36 -07:00
Evan
0dabbc2d31
fix misty terrain check
2021-01-16 12:39:44 -07:00
Evan
c2dfc571b2
misty terrain blocks confusion
2021-01-16 12:21:04 -07:00
Evan
10b1d33d13
handle battler being affected by terrain
2021-01-16 12:05:51 -07:00
Evan
9e29d303ec
electric and misty terrain preventions
2021-01-16 11:40:02 -07:00
Evan
0d8f804194
update mental herb to gen 5
2021-01-15 18:11:55 -07:00
LOuroboros
c2f718d3d3
Implemented Cramorant's Gulp Missile form change
2021-01-14 17:23:09 -03:00
LOuroboros
c21c0f8c37
Fixed incorrect preprocessor directive in ASM file
2021-01-13 22:42:56 -03:00
Evan
d26605c9fe
fix bad bg fade if no permanent terrain
2021-01-13 16:01:47 -07:00
Evan
9902f6e603
merge with be
2021-01-13 14:32:14 -07:00
Evan
8ef6a2c80d
merge with be
2021-01-13 14:23:30 -07:00
GriffinR
b9e1b050e1
Label remaining battle types
2021-01-13 15:20:29 -05:00
opakedragon
3ce4e6b24b
rename string id to reflect usage
2021-01-11 08:47:11 -05:00
Evan
1e22ae4cf2
merge with be
2021-01-10 09:08:25 -07:00
Evan
d4e4405cf5
merge with be
2021-01-10 09:04:21 -07:00
Evan
b5128be68b
eject packer invisible before openpartymenu
2021-01-08 08:02:00 -07:00
Evan
6dabff1ee3
merge with be
2021-01-07 21:24:21 -07:00
Evan
2bd5167a6c
eject pack
2021-01-07 21:11:56 -07:00
Evan
0118723a9c
add eject button
2021-01-07 20:31:27 -07:00
Evan
5eb49722c0
add red card effect
2021-01-07 19:33:39 -07:00
LOuroboros
8511ed57e4
Tweaked Steam Engine's battle string
2021-01-07 18:13:16 -03:00
LOuroboros
339aa95c1d
Review corrections
...
-Intrepid Sword and Dauntless Shield are now properly affecting the user
-Slightly tweaked Ball Fetch's effect, since an operation involving gBattleResults.catchAttempts was being done twice unnecessarily.
2021-01-07 04:31:26 -03:00
Evan
7fffe23e63
add terrain seeds
2021-01-06 20:22:05 -07:00
Evan
c1dd3fca21
add room service
2021-01-06 18:00:14 -07:00
Evan
db6f9d05ec
add throat spray
2021-01-06 15:28:58 -07:00
Evan
c3615485f3
merge in berry branch
2021-01-06 12:54:02 -07:00
Evan
7646855e79
jaboca, rowap berry effects
2021-01-06 11:15:56 -07:00
Evan
efa4fe89ad
micle berry
2021-01-06 10:47:07 -07:00
Evan
f2e486eb0d
custap berry effect, custap/quick claw activation message
2021-01-06 09:37:31 -07:00
Evan
b3a6df8d57
stat raising berries
2021-01-05 22:13:32 -07:00
Evan
f046a25ce0
ripen & hp restoring berries
2021-01-05 21:15:21 -07:00
Evan
0a3908ee92
add neigh and as one abilities
2021-01-05 19:37:23 -07:00
LOuroboros
517c8ffdd0
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_abilities_BE
2021-01-03 22:05:14 -03:00
BuffelSaft
10cf5b3673
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into Batte_Engine_Only
2021-01-04 10:55:30 +13:00
Evan
f172245ad6
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into totem
2021-01-01 08:49:43 -07:00
Evan
0c648c0071
merge with be
2021-01-01 08:34:09 -07:00
LOuroboros
3918542b3e
Corrections to Final Gambit's effect's battle script
...
-Restored the call to resultmessage
-Corrected its behavior against Endured, Focus Banded/Sashed and Sturdy foes
2020-12-20 21:31:36 -03:00
LOuroboros
9f2dc914ba
Tweaked Final Gambit's effect
...
-Made the user faint before the foe like in the official games
-Removed calls to resultmessage and critmessage as those were never needed by this move's effect
2020-12-19 22:12:17 -03:00
Evan
e70e2bcd65
merge with be
2020-12-14 09:09:51 -07:00
Evan
67fefd0261
var terrain, surge fixes
2020-12-13 19:42:48 -07:00
LOuroboros
dc34ad7e83
Tweaked abilitypopup usage on Cotton Down's BattleScript
2020-12-12 21:24:39 -03:00
LOuroboros
2b0702ec04
Implemented Perish Body
...
Inspired by Raguzero's implementation.
2020-12-11 19:44:32 -03:00
LOuroboros
7d8b8083e8
Implemented Sand Spit
2020-12-11 16:47:23 -03:00
LOuroboros
322918e280
Implemented Steam Engine
...
And I also made the BattleScript created for Anger Point a bit more neutral friendly so it can be reused on situations like this.
2020-12-10 18:27:35 -03:00
Evan
34dd11448b
sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem
2020-12-09 10:28:18 -07:00
Evan
a93a8b2194
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine
2020-12-08 20:50:43 -07:00
LOuroboros
c9824a8dd9
Fixed Cotton Down
...
It was tough, but the nightmare is finally over.
Ghoulslash, Blurose, Cancer Fairy, thanks to all of you guys!
2020-12-07 20:08:36 -03:00
BuffelSaft
72b769ec75
Add config options for Jump Kick
...
Added options for:
- Gen 4 style recoil when target is immune (user takes 50% of target's max HP)
- Gen 3 style recoil when target is immune (i.e no recoil)
- Gen 5+ recoil was already implemented but was bugged
2020-12-07 19:30:31 +13:00
Evan
21cab1b7a7
better negative totem boost system, totems occur before switch in abilities
2020-12-05 21:00:51 -07:00
BuffelSaft
ef41a4c14d
Fix Jump Kick
...
* Now inflicts recoil damage on the user if the target was immune to the attack
* Gen V+ recoil damage is now half of the user's HP instead of half of the target's HP.
2020-12-06 16:14:02 +13:00
LOuroboros
6a0fee9c56
Fixed Intrepid Sword and Dauntless Shield
...
And also introduced a new BattleString for BattleScript_BattlerAbilityStatRaiseOnSwitchIn
2020-12-05 14:03:13 -03:00
LOuroboros
002973d373
Renamed BattleScript_TargetAbilityStatRaiseOnSwitchIn
...
This battlescript is meant to be called within the case ABILITYEFFECT_ON_SWITCHIN of AbilityBattleEffects, which refers to the currently selected battler as Battler instead of Attacker or Target.
2020-12-05 13:50:47 -03:00
LOuroboros
6bbd88049a
Ball Fetch tweaks
2020-12-05 03:03:55 -03:00
LOuroboros
e2f4ca27b0
BattleScript_TargetAbilityStatRaiseOnSwitchin -> BattleScript_TargetAbilityStatRaiseOnSwitchIn
2020-12-05 02:43:29 -03:00
Evan
39cbc21925
fix trainer theft, update config option
2020-12-03 08:42:12 -05:00
LOuroboros
9e1d7cc827
Implemented Ball Fetch
2020-12-02 23:09:35 -03:00
LOuroboros
0c4c6fc778
Implemented Cotton Down
2020-12-02 22:53:00 -03:00
LOuroboros
e11fa09632
Implemented Intrepid Sword and Dauntless Shield and...
...
-Renamed BattleScript_TargetAbilityStatRaise to BattleScript_TargetAbilityStatRaiseOnMoveEnd
-Added a copy, BattleScript_TargetAbilityStatRaiseOnSwitchin
Their labels reflect the instances of a battle in which they can be called.
2020-12-02 19:07:08 -03:00
Evan
4ad5e368a9
fix merge conflicts
2020-12-01 17:57:57 -05:00
Evan
5478179464
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_anims
2020-12-01 17:46:26 -05:00
Evan
2bfc7ea9b1
merge upstream
2020-12-01 15:42:04 -05:00
Evan
f54cd0b25d
fix z effect scripts
2020-12-01 15:35:39 -05:00
Evan
a0bde70493
z move effects
2020-11-30 10:55:46 -05:00
ExpoSeed
aa7facf57b
Merge pull request #1243 from ghoulslash/abilities
...
Finish Switch In Ability Activation Messages
2020-11-28 20:27:32 -06:00
Evan
f114534ae3
z move anim/effect, black hole eclipse anim
2020-11-28 13:09:43 -05:00
Evan
4060b09bd6
expand top left move window. add z move init anim
2020-11-27 17:06:36 -05:00
ExpoSeed
914c830616
Remove Techno Blast and Judgment from battle scripts
2020-11-19 21:21:34 -06:00
Evan
07a4400d50
finish switch in ability messages
2020-11-19 11:42:00 -07:00
Evan
99d9a36860
add totem boosts
2020-11-19 10:35:37 -07:00
Evan
c026f705b3
permanent terrain move bgs
2020-11-17 19:45:27 -07:00
Evan
64bcac4589
move pickpocket to back of moveend sequence
2020-11-12 23:30:00 -07:00
Evan
e585be6f2e
format fix
2020-11-11 18:37:11 -07:00
Evan
520f00f4ae
add pickpocket
2020-11-11 18:08:46 -07:00
ExpoSeed
0912577ea1
Merge pull request #575 from AsparagusEduardo/BE-WishMegaEvo
...
Implemented Wish Mega Evolution
2020-11-11 11:05:06 -06:00
Eduardo Quezada D'Ottone
98d3427e62
Prevent Ability Popup overwrites #1218 from ghoulslash
2020-11-10 17:34:33 -03:00
Eduardo Quezada D'Ottone
e6f8d57f08
Merge remote-tracking branch 'RHH/battle_engine' into BE-WishMegaEvo
...
# Conflicts:
# include/constants/battle_string_ids.h
2020-11-10 17:28:17 -03:00
LOuroboros
bb4f00737e
B_EXPANDED_INTIMIDATE->B_UPDATED_INTIMIDATE
2020-11-10 14:26:47 -03:00
Evan
0683dc9c3f
longer ability popup delay to prevent overwriting
2020-11-10 10:05:11 -07:00
LOuroboros
a25190f357
A few things.
...
-Introduced a Gen. 8 styled text string for Intimidate
-Added an ability popup to BattleScript_IntimidatePrevented
2020-11-10 10:34:51 -03:00
LOuroboros
e179b9b5fe
Updated Intimidate to Gen. 8 standard
2020-11-10 10:18:16 -03:00
Eduardo Quezada D'Ottone
09a5d6c722
Implemented Wish Mega Evolution
2020-11-07 10:13:32 -03:00
Eduardo Alvaro Quezada D'Ottone
1df696c1fb
Merge pull request #17 from LOuroboros/move_updates
...
Updated many moves' data to Gen. 8 standards
2020-10-15 20:56:58 -03:00
LOuroboros
fcc3c6c6ba
Added a way to quickly switch Rapid Spin's move effect from Gen. 3 to 8
2020-10-15 04:21:40 -03:00
DizzyEggg
97d0643110
Merge with master
2020-09-08 12:48:28 +02:00
DizzyEggg
f70a9ce153
Merge with master
2020-08-27 12:01:28 +02:00
GriffinR
3014241179
Give songs meaningful english names
2020-08-20 19:06:14 -04:00
LOuroboros
1b9aa1f023
Updated many moves' data to Gen. 8 standards
2020-08-20 15:44:58 -03:00
GriffinR
5e8ffff62f
Add stat stage constants
2020-08-04 20:38:57 -04:00
DizzyEggg
0066640a1e
Merge with master
2020-07-27 14:51:39 +02:00
GriffinR
a4e47f1201
Clean some battle_message.c data
2020-07-23 05:01:42 -04:00
GriffinR
aba42513d3
Clean up some battle scr cmd data
2020-07-18 18:10:15 -04:00
DizzyEggg
759bde46bb
Cheek Pouch
2020-07-16 15:20:03 +02:00
DizzyEggg
1a94d27fe6
Emergency Exit
2020-07-15 17:21:12 +02:00
DizzyEggg
c93ab64e46
UTurn Battle Arena no switchin
2020-07-08 17:38:28 +02:00
DizzyEggg
5a2d9fe9fe
Fix Grassy Terrain bad loop
2020-06-29 18:26:53 +02:00
DizzyEggg
5ddb4634f5
berries work like in gen4
2020-06-29 18:04:13 +02:00
DizzyEggg
3bdf675221
Hopefully illusion works as intended now
2020-06-28 19:45:48 +02:00
Eduardo Alvaro Quezada D'Ottone
9fb073ca23
Some cleanup ( #454 )
...
* Toxic Thread doesn't have power.
* Added missing commas.
* Autotomize typo.
It wasn't until today that I learned that autotomize was a word.
2020-06-27 11:21:13 +02:00
DizzyEggg
04833ef6cf
Purify works on steel types
2020-06-26 21:58:37 +02:00
DizzyEggg
5698af3742
Magic Guard leech seed and slight ai tweaks
2020-06-26 15:14:15 +02:00
DizzyEggg
548a43f8d9
Rocky Helmet before Knock Off
2020-06-25 16:15:11 +02:00
DizzyEggg
d5ffdbf896
Focus Sash removed on use
2020-06-22 10:50:50 +02:00
DizzyEggg
8998e54ce7
Fix Heal Block Leech Seed
2020-06-22 10:40:08 +02:00
DizzyEggg
f2d2c1b76f
Merge pull request #438 from LOuroboros/effect_sleep_hit
...
Implemented Relic Song's effect
2020-06-22 10:10:15 +02:00
LOuroboros
33a45ba181
Implemented Relic Song's effect
2020-06-16 07:06:38 -03:00
LOuroboros
5f763a8380
Fixed Freeze Shock's 1st turn battle string
2020-06-16 04:11:37 -03:00
Eduardo Alvaro Quezada D'Ottone
8d848997c9
Battle Configs: The Revenge ( #363 )
...
* Turns for Uproar
* Chances for the amount of hits with multi-hit moves.
* Electric type mon's immunity to paralysis
* (Hi) Jump Kick to always do 1/2 of maxHP when crashing
* Turns for Disable.
* Minimized mons can always be hit by moves like Stomp
* Grass types immune to powder and spore moves.
* Psywave's damage formula
* Fixed random usage.
2020-05-28 10:38:27 +02:00
DizzyEggg
ee68f0f826
Fix switch-in abilities when shift style switch
2020-04-25 11:17:59 +02:00
DizzyEggg
738d92e39d
Infiltrator affects mist safeguard
2020-04-23 11:29:19 +02:00
DizzyEggg
40ce053ce1
Adrenaline Orb
2020-04-22 15:12:25 +02:00
DizzyEggg
d56aaf7c0b
Destiny Knot
2020-04-22 14:40:44 +02:00
DizzyEggg
c8ba013539
Power Herb
2020-04-22 10:44:19 +02:00
Eduardo Alvaro Quezada D'Ottone
c5a6acc7db
Corrosion ( #306 )
...
* Status move poisoning for Steel and Poison types.
* Can poison itself with Toxic Orb.
* Secondary effect poisoning now working.
* Created a function that checks if abilities can bypass type immunities.
* Created macro to handle typeimmunity
* Applied review changes.
* Applied review requests.
* Left more readable version of HOLD_EFFECT_TOXIC_ORB.
2020-04-21 15:59:19 +02:00
DizzyEggg
328e951afa
Ally Switch, tbd
2020-04-20 20:05:04 +02:00
DizzyEggg
0f628c8ff2
Fairy Lock
2020-04-20 19:41:07 +02:00
DizzyEggg
2daf1fbbf8
Geomancy
2020-04-20 19:02:03 +02:00
DizzyEggg
d38e0d8ae5
AI dont rely on power if bad effects
2020-04-20 11:27:09 +02:00
DizzyEggg
dd17360ab0
Zen Mode and Shields Down
2020-04-19 21:18:39 +02:00
DizzyEggg
ad481c8688
Moody
2020-04-19 15:44:44 +02:00
DizzyEggg
6a3944d27c
Frisk, would be easier if it didnt scan 2 opponents
2020-04-19 13:37:56 +02:00
DizzyEggg
e62f1475d4
Beast Boost and Receiver
2020-04-19 12:07:56 +02:00
DizzyEggg
e42ead10c9
Soul Heart
2020-04-18 19:59:09 +02:00
DizzyEggg
cbc0d8a57d
Healer
2020-04-18 19:09:17 +02:00
DizzyEggg
7178ea6b46
Shore Up
2020-04-18 18:34:18 +02:00
DizzyEggg
1395a7d382
Loafing Around bug fix
2020-04-18 13:04:28 +02:00
DizzyEggg
a2813e63de
Slow Start
2020-04-18 12:52:15 +02:00
DizzyEggg
34f5d9e2ae
Burn Up And Purify
2020-04-17 21:14:26 +02:00
DizzyEggg
01b6b63e99
Some more move animations. Thanks Doesnt
2020-04-17 17:44:28 +02:00
Eduardo Alvaro Quezada D'Ottone
2b9eb00486
Mind blown ( #302 )
...
* Mind Blown Part 1 (Definition and self-damage)
* Mind Blown Part 2 (Damp interaction)
2020-04-14 09:27:29 +02:00
DizzyEggg
51e1639513
Magic Guard protects from stuff
2020-04-13 15:49:40 +02:00
DizzyEggg
cb5b673f8a
Big Root and STRENGTH Sap
2020-04-13 15:00:17 +02:00
Eduardo Alvaro Quezada D'Ottone
6078cd3e15
Anticipation ability ( #282 )
2020-04-11 12:24:25 +02:00
DizzyEggg
6daab7a5c9
Fix Damp loop
2020-04-11 12:02:51 +02:00
DizzyEggg
1435cd4692
Change inner structure of semi invulerable moves
2020-04-11 11:47:13 +02:00
DizzyEggg
efe17d995c
Fix Healing Wish
2020-03-14 12:31:42 +01:00
DizzyEggg
6968124529
Merge battle anim documentation
2020-02-29 13:59:41 +01:00
Eduardo Alvaro Quezada D'Ottone
147f954ab5
Fixed Damp ability popup ( #295 )
2020-02-29 09:45:37 +01:00
GriffinR
e633b57593
Document remaining status/general/special anims
2020-02-25 12:54:08 -06:00
DizzyEggg
da965700ff
Draining abilities have the pop-up appear now
2020-02-22 19:25:35 +01:00
DizzyEggg
7c81accf7b
Switch-in abilities for megas
2020-02-16 13:34:25 +01:00
LOuroboros
0bccf91f1a
Cleaned up the transition of many battlescripts in battle_scripts_1.s ( #273 )
2020-02-16 13:14:18 +01:00
Eduardo Alvaro Quezada D'Ottone
33e8e20118
Disguise ability ( #258 )
...
* Protection from attacks.
* Changes form when Busting Disguise.
* Ability changing moves set to fail.
- Simple Beam and Worry Seed now fail if the target has Disguise.
- Role Play and Skill Swap now fail if either the attacker or the target have Disguise.
* Disguise no longer triggers when transformed.
* Mimikyu reverts to Disguised
* No longer blocks from entry hazards and weather.
* Applied review changes
* Oops, new line
* yeah
2020-02-08 19:29:51 +01:00
DizzyEggg
e7d5ebb3b6
Make Charge raise sp.def
2020-02-08 11:55:16 +01:00
DizzyEggg
a6bf183653
Fix Aegi ability pop up sliding
2020-01-18 20:33:46 +01:00
DizzyEggg
5c486c15dd
Fix Moxie battler
2020-01-18 19:40:49 +01:00
DizzyEggg
06a9165f75
Fix Ice Body not working
2020-01-18 19:18:57 +01:00
DizzyEggg
952bdbd9f5
Steadfast string fix
2020-01-04 18:41:59 +01:00
DizzyEggg
39e3b0b740
Form changes layout and Stance Change Aegi
2019-12-31 19:11:53 +01:00
DizzyEggg
b15f0b3bb3
Comatose
2019-12-31 16:36:53 +01:00
DizzyEggg
eb029d557b
Merge pull request #215 from LOuroboros/aftermath
...
Implemented Aftermath's effect
2019-12-25 12:04:09 +01:00
LOuroboros
3367bdaf51
Made Aftermath trigger the Ability Pop Up sign
2019-12-23 14:17:54 -03:00
LOuroboros
c690d577a5
Implemented Aftermath's effect
2019-12-21 05:01:42 -03:00
ultima-soul
df95c4801a
Spaces to tabs
2019-12-18 13:03:01 -08:00
ultima-soul
029ab67ff4
Implement Leaf Guard.
2019-12-16 00:29:20 -08:00
Nephrite
0343f63eda
Dancer
...
Implemented Dancer and all relevant code for interacting with abilities, certain moves, etc
2019-12-07 10:19:01 +00:00
DizzyEggg
ea6736cd8d
merge
2019-11-10 12:09:14 +01:00
huderlem
a4b4ecd470
Merge pull request #787 from GriffinRichards/rename-tablecmds
...
Rename table cmds
2019-11-04 16:31:27 -06:00
DizzyEggg
1d8cc9b741
Fix merge conflicts
2019-11-03 19:55:19 +01:00
DizzyEggg
48cb0d898d
Fix Psycho Shift string
2019-10-26 22:39:07 +02:00
GriffinR
5fd44d1e74
Rename some STAT_CHANGE macros
2019-10-26 11:53:00 -04:00
GriffinR
a4d6ce417d
Fix resetintimidatetracebits typo
2019-10-22 15:54:11 -05:00
GriffinR
73b96fe145
Rename CONTACT macros to ON_DAMAGE
2019-09-27 12:27:36 -04:00
GriffinR
3bf8129396
Clean up new Cmd macro names
2019-09-27 02:54:28 -04:00
GriffinR
bb236b490d
Update BS constants for Cmd rename
2019-09-15 17:58:12 -04:00
DizzyEggg
f979987c2f
Fix Intimidate and Trace on new switch in system
2019-08-30 12:25:21 +02:00
GriffinR
869d0eebc0
Rename atk## constants and states
2019-08-23 08:46:21 -04:00
DizzyEggg
c9de753ecc
Illusion
2019-08-08 13:06:55 +02:00
DizzyEggg
2863045241
Fix switch-in abilities text/pop-up
2019-08-05 11:24:49 +02:00
DizzyEggg
3e476adf4a
Stockpile gen4 effect and fixed spit up
2019-07-09 19:06:12 +02:00
Karathan
e9884154a9
added acupressure and wring out
2019-07-03 03:45:11 +02:00
DizzyEggg
aaea5398f4
Fix Castfrom ability pop-up and refactor one function
2019-06-14 12:58:29 +02:00
DizzyEggg
76c5287629
Bug Bite
2019-05-23 12:32:14 +02:00
DizzyEggg
1b7493e47a
Fix Flame Burst crashing the game
2019-05-23 10:02:04 +02:00
DizzyEggg
e00890a555
Fix Air Baloon msg
2019-05-20 12:20:49 +02:00
DizzyEggg
e1ea4b62e9
Natural Gift
2019-05-20 12:03:00 +02:00
DizzyEggg
824a95fe07
Incinerate
2019-05-10 15:12:33 +02:00
DizzyEggg
d027bb0d7a
Life Flame toxic orbs
2019-05-10 11:03:33 +02:00
DizzyEggg
875b413a09
Various battle target items
2019-05-09 20:31:58 +02:00
DizzyEggg
bb8e397e5b
Gems and dmg reducing berries
2019-05-07 15:26:58 +02:00
DizzyEggg
d0f91a996d
Tweak up mega evo
2019-05-02 23:10:01 +02:00
Papa Cancer
3cde800bd0
Magnetic Flux + Gear Up
...
Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities.
Magnetic Flux uses Charge animation.
2019-04-20 20:17:56 +01:00
Papa Cancer
b50007e861
Instruct
...
Re-PR'd due to excess "merges"
2019-04-20 20:11:49 +01:00
Papa Cancer
7e99272482
Laser Focus
...
Re-PR'd due to excess "merges"
2019-04-20 20:02:52 +01:00
Papa Cancer
c4acc3dbf8
Merge branch 'battle_engine_v2' into beta
2019-04-20 16:49:57 +01:00
DizzyEggg
5b43a9289d
Merge pull request #134 from thechurchofcage/epsilon
...
Baneful Bunker + King's Shield
2019-04-20 08:42:35 +02:00
Papa Cancer
e310d0f10e
Core Enforcer
...
New code - uses Gastro Acid script instead through own move effect
2019-04-18 12:10:18 +01:00
Papa Cancer
754befe393
Baneful Bunker + King's Shield
...
Both apply a move effect from atk49. King's Shield swaps attacker and defender for the sake of Defiant etc. and then swaps them back!
2019-04-17 14:54:21 +01:00
Papa Cancer
e5e45bbcf5
Throat Chop
...
Added strings that show when Throat Chop prevents move usage. Added extra string (not present in games) to show when it ends as there is no indication otherwise. Fixed Embargo's string as well.
2019-04-17 13:52:25 +01:00
DizzyEggg
549a9cdcc2
Merge pull request #118 from thechurchofcage/beta
...
Stomping Tantrum
2019-04-13 14:09:15 +02:00
Papa Cancer
fd6dc98045
Hold Hands fix
...
Better check for valid ally. If there isn't one, the target defaults to the attacker, causing the move to fail.
2019-04-06 22:23:34 +01:00
Papa Cancer
33d484a7ed
Merge branch 'battle_engine_v2' into beta
2019-04-06 00:38:56 +01:00
Papa Cancer
43525d2a9c
Merge branch 'battle_engine_v2' into delta
2019-04-05 23:13:41 +01:00
DizzyEggg
794c9aa255
Merge pull request #121 from thechurchofcage/epsilon
...
Three pointless moves
2019-04-05 23:47:54 +02:00
Papa Cancer
4c8bc9d526
Three pointless moves
...
Celebrate, Hold Hands and Happy Hour. Yay(!)
Update: turns out Pay Day works differently to how I thought, so I added a new move effect for Happy Hour doubling prize money.
Made all three effects subset of EFFECT_SPLASH, now called EFFECT_DUMB, as per Egg's instructions ( ͡° ͜ʖ ͡°)
2019-04-05 18:10:02 +01:00
DizzyEggg
183b714ff1
Merge with master and fix web moves
2019-04-05 12:43:44 +02:00
Fontbane
90e32f4ec5
Document landmark setting and item balls
2019-04-04 19:34:35 -05:00
Papa Cancer
c9ad96d228
Stomping Tantrum
...
Uses timer in gBattleStruct to count time since last failed move. This is augmented by a MOVE_FAILED result in atk_49 and decreased with an ENDTURN case. EFFECT_STOMPING_TANTRUM doubles base power if the timer is set.
2019-04-01 20:06:45 +01:00
DizzyEggg
62192b86f7
Aroma Veil
2019-04-01 11:42:37 +02:00
DizzyEggg
e878de782e
Merge pull request #114 from thechurchofcage/gamma
...
Misc. move updates
2019-03-31 22:08:14 +02:00
DizzyEggg
6f9096c613
Add Sweet Veil
2019-03-31 22:02:39 +02:00
DizzyEggg
b12334c88b
Remove cases from ABE, add functionality of Flower Veil
2019-03-31 21:38:58 +02:00
Papa Cancer
1d5cf3acb5
Misc. move updates
...
Bind: 75% Acc -> 85% Acc
Disable: 55% Acc. -> 100% Acc.
Freeze-Dry: 10% chance to freeze
Hammer Arm and Ice Hammer: lower user's speed
High Jump Kick: 130BP, 10 PP
Jump Kick: 100BP, 10 PP
Tail Glow: raises Sp. Atk by 3 stages
Waterfall: 20% chance to flinch
2019-03-31 18:25:37 +01:00
Papa Cancer
ebe2dc6bbb
Mat Block
...
Nothing more needs to be said
2019-03-31 17:17:13 +01:00
DizzyEggg
17e74756cb
Merge with master, add defines to atk49 and statbuffchange commands
2019-03-31 15:19:25 +02:00
DizzyEggg
35cffea987
Helpful macros for atk49
2019-03-30 08:29:56 -05:00
DizzyEggg
876be1d9cd
Merge pull request #104 from thechurchofcage/beta
...
Spiky Shield
2019-03-30 11:21:27 +01:00
DizzyEggg
5dd653a89e
Use constants in atk89_statbuffchange
2019-03-27 07:47:01 -05:00
Papa Cancer
a3b4767dd2
Spiky Shield
...
Created generic string "Atk was hurt by Def's BUFF" for use for both Spiky Shield and Rough Skin - can also be used for Aftermath and Rocky Helmet, when programmed
2019-03-26 17:45:34 +00:00
Papa Cancer
61a7bd2788
Taunt fix etc.
...
Taunt now works for the correct number of turns and has its own ending string - made by reusing the "Heal Block ends" string as a multi-purpose "X wore off" one. Fixed a bug in PREPARE_STRING_BUFFER and touched up the ENDTURN timers for various STATUS3's.
Heal Block now displays the correct string when preventing usage of a move.
2019-03-24 12:54:01 +00:00
DizzyEggg
b8a634770f
Touch up Weak Armor
2019-03-23 16:56:56 +01:00
DizzyEggg
b9052fb37d
Touch Up Justified and Rattled
2019-03-23 16:37:56 +01:00
DizzyEggg
e135ea47e5
Touch up Anger Point
2019-03-23 16:33:08 +01:00
DizzyEggg
c329252ce3
Add Safety Googles effect
2019-03-08 10:16:54 +01:00
DizzyEggg
f9ee31903d
VCreate and fix stat stage changes functions
2019-03-07 12:20:57 +01:00
DizzyEggg
666e2ac584
Fix allowing the player to run from wild double battles
2019-03-06 12:13:37 +01:00
DizzyEggg
7a8f524bc5
Proper Roar handling in double battles
2019-03-06 12:09:34 +01:00
DizzyEggg
fddb5159b4
Merge with master
2019-03-05 21:46:45 +01:00
Papa Cancer
2050ac3963
Grassy Terrain v2
...
All corrected, simplest version
Also includes proper ending strings for all terrains
2019-03-05 19:13:25 +00:00
DizzyEggg
b150091436
Rename an erroneously named battlescript
2019-03-05 17:06:29 +01:00
Phlosioneer
4ea5e85bed
Fix typos
...
This is an updated version of #554 , since it hasn't been updated in two
weeks.
2019-03-03 09:31:47 -06:00
Papa Cancer
cfd50eb65a
Grassy Terrain + minor fixes
...
Includes strings for all
Fixes:
・Psychic Terrain blocks priority if the TARGET is grounded, not the user
・Psychic Terrain no longer targets an opponent
・Terrains no longer boost (or nerf, for Misty) the power of certain moves if the affect mon is semi-invulnerable
・Small fix: Meteor Mash corrected to being a physical attack
2019-03-02 22:52:43 +00:00
DizzyEggg
bf70861798
Powder moves on grass types
2019-03-02 13:08:50 +01:00
DizzyEggg
eea162d3d8
Effect Spore ability pop-up
2019-03-01 13:59:08 +01:00
DizzyEggg
fa81559793
Fix Sturdy's pop-up
2019-03-01 13:53:06 +01:00
Papa Cancer
d704b9cd5b
Gravity fix
...
Brings down Pokémon in the middle of a two-turn flying move (only Bounce and Fly at the moment); says the appropriate message for all mons brought to the ground via Gravity
2019-02-24 13:28:24 +00:00
DizzyEggg
c1f9032989
Defiant and Competitive
2019-02-16 12:54:11 +01:00
DizzyEggg
94cd547e9a
Change move effect to u16
2019-02-14 13:17:27 +01:00
DizzyEggg
dc39f76a95
Spectral Thief effect
2019-02-14 12:15:53 +01:00
DizzyEggg
4c535a1b03
Merge pull request #71 from thechurchofcage/partingshot
...
Parting Shot
2019-02-10 18:18:49 +01:00
Papa Cancer
dd34272620
Parting Shot v3
2019-02-09 17:40:04 +00:00
Papa Cancer
a1be618c47
Parting Shot v2
...
With DizzyEgg's amendment
2019-02-09 16:05:59 +00:00
DizzyEggg
3d616dfffe
Add Surge Abilities
2019-02-09 14:30:16 +01:00
Papa Cancer
62fd90caa0
Parting Shot
...
Effect plus animation (looks like Snarl)
2019-02-05 21:47:50 +00:00
DizzyEggg
a42bba755b
Add Crafty Shield effect
2019-02-01 14:34:16 +01:00
DizzyEggg
a3460c9e45
Code Belch effect
2019-02-01 14:17:24 +01:00
DizzyEggg
fab5b86d31
Fix Embargo string
2019-02-01 13:41:08 +01:00
DizzyEggg
88b788bfab
Fix Charge Beam effect
2019-01-27 11:57:13 +01:00
DizzyEggg
2c3210f4d1
merge with master
2019-01-18 22:30:34 +01:00
DizzyEggg
c0bc01d301
Move some vars to C
2019-01-13 13:15:23 +01:00
DizzyEggg
b60915539d
Fix Phantom Force
2018-12-08 16:19:50 +01:00
DizzyEggg
b9e711bbf4
Add Powder
2018-12-03 12:50:32 +01:00
DizzyEggg
d46c3ebe5b
Fix Future Sight
2018-12-02 18:47:39 +01:00
DizzyEggg
6ae949e360
Psychic Terrain blocks priority moves
2018-12-01 11:35:49 +01:00
DizzyEggg
1a8859b1d8
Add Dazzling
2018-11-30 22:12:18 +01:00
DizzyEggg
0329175f06
Add Protean
2018-11-30 21:21:43 +01:00
DizzyEggg
a0699dba52
Add Aromatic Mist
2018-11-25 12:59:22 +01:00
DizzyEggg
434e257943
Add Acupressure
2018-11-24 21:06:53 +01:00
DizzyEggg
194139a35b
Add Move Effect - Feint
2018-11-24 19:37:10 +01:00
DizzyEggg
15b8046b2b
Add third type
2018-11-17 12:10:24 +01:00
DizzyEggg
bb9dbc0c6d
Merge with master
2018-11-14 22:50:27 +01:00
DizzyEggg
a4235c9ff8
Document battle arena
2018-11-11 18:33:16 +01:00
DizzyEggg
bc42de5f60
Aurora Veil, Revelation Dance, Diamond Storm
2018-11-03 14:35:45 +01:00
DizzyEggg
68d94ad316
Implement trainer sliding
2018-11-03 01:17:16 +01:00
DizzyEggg
e9965dd341
merge with master
2018-11-02 22:55:32 +01:00
DizzyEggg
0e6fbbfe09
Make battle tower compile
2018-10-27 00:04:18 +02:00
DizzyEggg
7925000a54
merge with master
2018-10-06 16:05:58 +02:00
DizzyEggg
6b5c52e926
Flower Shield and protect moves
2018-10-06 15:50:35 +02:00
Marcus Huderle
b9e38a569e
Merge pull request #320 from DizzyEggg/anims
...
Document battle animation scripts
2018-10-06 08:20:41 -05:00
DizzyEggg
17c5b4089a
Label most of the anim tags
2018-10-06 09:37:52 +02:00
DizzyEggg
de9e9072fc
Rototiller and 2 turn moves
2018-09-30 14:04:46 +02:00
DizzyEggg
162c83fcff
Bestow
2018-09-30 12:27:51 +02:00
DizzyEggg
7623eabdee
After you
2018-09-29 19:37:39 +02:00
DizzyEggg
b9cf1fdcfe
Psycho Shift, Power Trick, Flame Burst
2018-09-29 18:40:14 +02:00
DizzyEggg
dddefbb0e3
Full support for moves hitting all battlers
2018-09-29 16:41:25 +02:00
DizzyEggg
ada76cbe4f
Synchronoise and Smack Down
2018-09-29 15:43:56 +02:00
DizzyEggg
597299136f
Add Pollen Puff effect
2018-09-29 14:10:53 +02:00
DizzyEggg
cbaae44f9f
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
DizzyEggg
731ff38067
Ability pop-up functionality is done
2018-09-29 12:47:35 +02:00
DizzyEggg
3f2beff554
Defog
2018-09-23 19:03:53 +02:00
DizzyEggg
6b7a171dbe
Ability pop-up fail, maybe will do something about it later
2018-09-23 14:24:06 +02:00
DizzyEggg
37d8859404
random move to called move
2018-09-22 19:27:56 +02:00
DizzyEggg
60e8c80c4c
Merge branch 'master' into battle_engine_v2
2018-09-22 19:14:56 +02:00
DizzyEggg
611360c29e
calledattack to calledmove
2018-09-22 19:08:41 +02:00
DizzyEggg
e362c06aea
gRandomMove to gCalledMove
2018-09-22 18:41:00 +02:00
DizzyEggg
19e1606595
Add Copycat
2018-09-22 18:37:03 +02:00
DizzyEggg
db44a7e25a
Techno Blast and Autotomize
2018-09-22 17:27:51 +02:00
DizzyEggg
9474254e4d
Final Gambit, Dragon Tail
2018-09-22 16:15:00 +02:00
DizzyEggg
ca9876b0b4
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
DizzyEggg
f455f663f4
Shell Smash move effect
2018-09-22 11:13:17 +02:00
DizzyEggg
1284bb94f1
Last Resort, Fangs and Flare Blitz/Volt Tackle
2018-09-22 10:45:43 +02:00
DizzyEggg
23a06c0836
Close combat effect
2018-09-22 01:12:27 +02:00
DizzyEggg
7b60a654b2
Growth gen6 effect
2018-09-22 01:01:13 +02:00
DizzyEggg
a69af8f2f5
Merge with master
2018-09-22 00:22:13 +02:00
DizzyEggg
66fd9b2ddf
Label trainer hill battle type
2018-09-20 22:00:00 +02:00
DizzyEggg
602c1322e4
almost full support for link battles mega evolution
2018-09-20 11:23:12 +02:00
DizzyEggg
2042788fdc
Mega Evolution done except sprites.
2018-09-16 21:08:49 +02:00
DizzyEggg
55f21c1776
Mega Evolution support is mostly done.
2018-09-16 18:55:32 +02:00
DizzyEggg
10b479a3ca
Document battle animation scripts.
2018-09-10 21:19:19 +02:00
DizzyEggg
f9af3bec9b
merge with master
2018-09-02 00:07:19 +02:00
DizzyEggg
44ba432dad
Label various battle scripts
2018-09-01 20:00:13 +02:00
DizzyEggg
490a4f993b
Merge with master
2018-09-01 12:38:38 +02:00
DizzyEggg
2b7c138cbe
Some labels
2018-08-25 21:04:12 +02:00
DizzyEggg
4cb1e880da
Reflect Type and SOAK
2018-08-11 13:30:34 +02:00
DizzyEggg
e259000dc3
Coil and Quiver Dance
2018-08-11 12:29:01 +02:00
DizzyEggg
674d35861c
Couple bug fixes
2018-08-11 12:16:00 +02:00
DizzyEggg
d230d986fa
Me First.
2018-08-05 16:43:07 +02:00
DizzyEggg
de85f88bbb
Support for two typed moves.
2018-08-05 13:57:37 +02:00
DizzyEggg
5fbeef860c
Bulletproof and a couple of new moves
2018-08-05 13:39:22 +02:00
DizzyEggg
065032bf35
Moves changing terrains
2018-08-05 12:43:57 +02:00
DizzyEggg
2218949d7c
Topsy Turvy and Ion Deluge.
2018-08-04 23:34:29 +02:00
DizzyEggg
222ea7269d
Rapid Spin blews all hazards, Quash and a couple of new move effects
2018-08-04 22:23:07 +02:00
DizzyEggg
9ff7b0e849
Effect to u16, Lucky Chant, Sucker Punch, Sticky Web and Metal Burst
2018-08-04 20:36:24 +02:00
DizzyEggg
2d73637ff4
Introduce argument and do Draining kiss
2018-08-03 19:01:03 +02:00
DizzyEggg
28b4d0d9dc
Make it compile
2018-08-03 00:21:40 +02:00
DizzyEggg
320120d529
Merge with master
2018-08-03 00:20:34 +02:00
DizzyEggg
c7baa71a5e
Add placeholder string for not done moves.
2018-08-02 20:32:13 +02:00
DizzyEggg
198a1a8646
Proper Sound moves and substitute
2018-08-02 20:24:18 +02:00
DizzyEggg
b73075f822
Update Unusable Moves
2018-07-31 23:09:47 +02:00
DizzyEggg
44a454ecb4
Moves with accuracy 0 bypass accuracy checks; Heal Block move effect done
2018-07-30 20:41:16 +02:00
DizzyEggg
68145cd002
Document atk48
2018-07-29 15:33:16 +02:00
DizzyEggg
2f6cc2be80
Electric types immune to paralysis
2018-07-29 12:45:08 +02:00
DizzyEggg
3d93da7133
Add Imposter
2018-07-29 12:21:28 +02:00
DizzyEggg
d628d1f5fd
Move Weather Ball, Hidden power, AI support for dynamic type moves and AI debug support
2018-07-29 11:32:40 +02:00
DizzyEggg
3a0c244f40
Add Harvest
2018-07-28 17:13:47 +02:00
DizzyEggg
ef3c39fbae
Fix Counter and Mirror Coat
2018-07-28 10:58:47 +02:00
DizzyEggg
43fc4b6933
Add Magic Bounce
2018-07-28 10:41:20 +02:00
DizzyEggg
9088c0bdb5
Introduce battle config; Snow Warning Done.
2018-07-27 23:40:10 +02:00
DizzyEggg
f51812d0fe
Add Fell Stinger
2018-07-26 23:40:55 +02:00
DizzyEggg
d991d669da
Add Moxie
2018-07-26 22:52:13 +02:00
DizzyEggg
16d38f5343
Add a couple of gen5 abilities
2018-07-26 21:56:23 +02:00
DizzyEggg
1c95c36338
Healing Wish and Lunar Dance
2018-07-26 20:36:16 +02:00
DizzyEggg
100ce73a12
Sticky Web done
2018-07-24 22:09:55 +02:00
DizzyEggg
f8b1f0a45c
Stealth Rock and Toxic Spikes
2018-07-24 21:47:00 +02:00
DizzyEggg
3f7e6e9fe0
Add U-turn effect
2018-07-23 22:43:05 +02:00
DizzyEggg
567a0240f3
Fix crits and do Worry Seed
2018-07-23 22:18:56 +02:00
DizzyEggg
6570324432
New crit calculator.
2018-07-23 21:36:05 +02:00
DizzyEggg
194adf0ab2
Abilities affected by weather conditions
2018-07-22 22:41:13 +02:00
