DizzyEggg
f8713f9c15
Merge with master
2019-04-06 20:43:13 +02: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
b0223f691f
Clean up data headers
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
DizzyEggg
944dc4f6bf
Merge with master
2019-04-01 13:40:42 +02:00
DizzyEggg
62192b86f7
Aroma Veil
2019-04-01 11:42:37 +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
Marcus Huderle
462b196abc
Give battle_anim files appropriate names
2019-03-31 12:15:39 -05:00
DizzyEggg
876be1d9cd
Merge pull request #104 from thechurchofcage/beta
...
Spiky Shield
2019-03-30 11:21:27 +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
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
c329252ce3
Add Safety Googles effect
2019-03-08 10:16:54 +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
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
Phlosioneer
3716da5430
Rename macro with correct name for pixel values
2019-03-02 17:25:39 -05:00
DizzyEggg
8e9296a42b
Fix team messages
2019-03-02 12:31:07 +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
Phlosioneer
c96f8751cd
Improve window palette macros
2019-02-21 23:27:12 -05:00
DizzyEggg
dc39f76a95
Spectral Thief effect
2019-02-14 12:15:53 +01:00
DizzyEggg
f415871369
Merge with master
2019-02-03 10:44:05 +01:00
DizzyEggg
b3d48c0ed6
Get rid of an unnecessary extern
2019-02-01 19:45:06 +01:00
DizzyEggg
a3460c9e45
Code Belch effect
2019-02-01 14:17:24 +01:00
DizzyEggg
736826e863
New feature - battle 2 vs 1 opponent
2019-01-27 20:54:34 +01:00
DizzyEggg
2c3210f4d1
merge with master
2019-01-18 22:30:34 +01:00
DizzyEggg
edddd847c5
Document and clean up trainer hill
2019-01-13 20:50:08 +01:00
DizzyEggg
78d7c29290
Move buffers to allocated reousrces, get rid of old type effectiveness table
2019-01-05 16:00:57 +01:00
DizzyEggg
517573eb4b
Update with master
2018-12-26 17:46:51 +01:00
melthelesbian
2dd706ca54
use max mon moves constant where able ( #480 )
...
* use max mon moves constant where able
* fix errors in script commands file
* fix more errors
2018-12-25 11:50:15 -06:00
DizzyEggg
6fa5f33519
Merge branch 'master' into battle_engine_v2
2018-12-24 09:07:18 +01:00
DizzyEggg
9320fe8f85
Clear includes
2018-12-24 00:02:29 +01:00
DizzyEggg
f7a7ddde0c
Fix Quick Guard
2018-12-22 15:10:24 +01:00
DizzyEggg
180aa839c4
Fix conflicts
2018-12-09 13:12:02 +01:00
DizzyEggg
b60915539d
Fix Phantom Force
2018-12-08 16:19:50 +01:00
nullableVoidPtr
f50faac244
Clean more tables
2018-12-08 14:10:30 +08:00
nullableVoidPtr
8a8baaeaaa
Merge remote-tracking branch 'upstream/master'
2018-12-08 12:13:15 +08:00
DizzyEggg
470df386c9
Fix conflicts
2018-12-07 23:01:14 +01:00
Melody
2615ece23b
Use normal apostrophes like adults
2018-12-07 10:41:08 -05:00
nullableVoidPtr
f9ff7316d5
Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs
2018-12-06 10:38:28 +08:00
nullableVoidPtr
3909b6408c
Fix alloc.c as per #386 , define INVALID_ constants and rename malloc to alloc as per #325
...
Some of the INVALID_ are likely erroneously placed, due to lack of documentation
2018-12-06 09:44:08 +08:00
DizzyEggg
b9e711bbf4
Add Powder
2018-12-03 12:50:32 +01:00
DizzyEggg
1a8859b1d8
Add Dazzling
2018-11-30 22:12:18 +01:00
DizzyEggg
7fa55704b2
merge with master
2018-11-30 20:46:09 +01:00
DizzyEggg
194139a35b
Add Move Effect - Feint
2018-11-24 19:37:10 +01:00
DizzyEggg
539b05ff73
Begin working on custom multi battles
2018-11-24 01:02:02 +01:00
Slawter666
3b501cb470
Document battle ui
2018-11-22 01:10:50 +00: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
