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
93e86e6a76
Tweak Stomping Tantrum
2019-04-13 14:36:08 +02:00
DizzyEggg
549a9cdcc2
Merge pull request #118 from thechurchofcage/beta
...
Stomping Tantrum
2019-04-13 14:09:15 +02:00
DizzyEggg
2646f3b26a
Merge with master
2019-04-13 13:42:44 +02:00
Phlosioneer
50350cc2e1
Merge branch 'master' into contest-ai-cleanup
2019-04-07 20:20:22 -04:00
DizzyEggg
f8713f9c15
Merge with master
2019-04-06 20:43:13 +02: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
a83255d103
fix after prs
2019-04-06 00:03:03 +02:00
DizzyEggg
794c9aa255
Merge pull request #121 from thechurchofcage/epsilon
...
Three pointless moves
2019-04-05 23:47:54 +02:00
DizzyEggg
7c8f69e6e3
Merge pull request #109 from Fontbane/patch-4
...
Field Effects for Gen IV Abilities
2019-04-05 23:40:30 +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
Fontbane
7bc3cdf527
Delete level variable
2019-04-05 10:16:41 -04:00
DizzyEggg
8751fafad1
Make it compile
2019-04-05 07:53:23 -05:00
DizzyEggg
dd24597d52
Finish up menu specialised
2019-04-05 07:53:23 -05:00
DizzyEggg
183b714ff1
Merge with master and fix web moves
2019-04-05 12:43:44 +02:00
AJ Fontaine
704f025a00
Fix a typo in as(s)istattackselect
2019-04-04 19:34:35 -05:00
Phlosioneer
1360b3a477
RGB Constants
2019-04-04 17:05:46 -04:00
ultima-soul
91a94a0ca1
Try to get closer to matching.
2019-04-03 21:13:26 -07:00
Fontbane
562ad70915
Removed Gen 4 Ability field effects
2019-04-01 23:07:21 -04:00
DizzyEggg
d39b5f6d26
Fix messing with move result flags when not needed
2019-04-02 00:14:01 +02: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
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
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
ea0049da89
Fix Spiky Shield
2019-03-30 11:50:55 +01:00
DizzyEggg
876be1d9cd
Merge pull request #104 from thechurchofcage/beta
...
Spiky Shield
2019-03-30 11:21:27 +01:00
DizzyEggg
567240b725
Merge pull request #107 from thechurchofcage/gamma
...
Taunt fix etc.
2019-03-29 22:24:03 +01:00
DizzyEggg
e92a0816fd
Merge pull request #110 from thechurchofcage/epsilon
...
Minor Doubles ability fixes
2019-03-29 22:20:04 +01: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
408485263d
Minor ability fixes
...
Status moves that target both opponents will trigger a mon with Clear Body, White Smoke, Hyper Cutter etc. to prevent the loss of stats, but if its partner is targeted first, that partner gets the popup: https://drive.google.com/open?id=1dtTfgxvppD4s2ZL5scPDz9YDf4n7AhMW
This fixes that.
2019-03-26 01:34:39 +00:00
Fontbane
2cfa5ea326
Fixed Honey
...
And updated gitignore
2019-03-25 19:00:46 -04:00
Fontbane
fc69631a10
Field effects for Gen IV Abilities
...
Also added Honey (acts like White Flute for now) and made it so the Griseous Orb can't be removed from Giratina in battle.
2019-03-25 17:49:29 -04: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
7018745230
Fix Defiant stat raise by allies
2019-03-23 17:21:14 +01:00
DizzyEggg
e135ea47e5
Touch up Anger Point
2019-03-23 16:33:08 +01:00
DizzyEggg
54ab6b43dc
Merge with master
2019-03-22 10:40:31 +01:00
Marcus Huderle
e9a3cc6d51
Merge remote-tracking branch 'upstream/master' into move-tutor
...
# Conflicts:
# include/pokenav.h
# src/battle_script_commands.c
2019-03-17 17:20:40 -05:00
Phlosioneer
9848f84b9e
Use constants for Oam .shape and .size fields
...
Also some general formatting fixes for constants.
2019-03-16 12:37:04 -05:00
DizzyEggg
c329252ce3
Add Safety Googles effect
2019-03-08 10:16:54 +01:00
Phlosioneer
5886f82ef5
Merge branch 'master' into extern-cleanup
2019-03-08 02:45:26 -05:00
Phlosioneer
b93d923826
Merge branch 'master' into move-tutor
2019-03-08 02:27:20 -05:00
DizzyEggg
f9ee31903d
VCreate and fix stat stage changes functions
2019-03-07 12:20:57 +01:00
DizzyEggg
7a8f524bc5
Proper Roar handling in double battles
2019-03-06 12:09:34 +01:00