Karathan
5f7b5ba453
add feint and pluck animation sprites and implementations
2019-07-02 06:22:05 +02:00
DizzyEggg
a98c5ab78a
Merge branch 'master' into battle_engine_v2
2019-06-24 12:12:56 +02:00
garak
2c22a82a25
clean metatile constants file
2019-06-16 10:08:07 -05:00
garak
a43dcd26bd
finish labeling metatiles
2019-06-16 10:08:07 -05:00
garak
713f61de7c
continue labeling metatiles for scripts
2019-06-16 10:08:07 -05:00
garak
fbbc2b1d8b
finish src metatile labels
2019-06-16 10:08:07 -05:00
garak
9f8a30e4e7
label metatiles in fldeff_cut.c
2019-06-16 10:08:07 -05:00
garak
8b26bd1e09
label metatiles for general, fallarbor, and sootopolis gym tilesets
2019-06-16 10:08:07 -05:00
garak
aad839995f
label metatiles for pacifidlog and fortree bridges
2019-06-16 10:08:07 -05:00
garak
724add638c
label regi cave metatiles
2019-06-16 10:08:07 -05:00
garak
7e35b8a710
label remaining metatiles in field_specials.c
2019-06-16 10:08:07 -05:00
garak
a9560d9c62
give metatile labels to petalburg gym and pcs
2019-06-16 10:08:07 -05:00
garak
c68ba9f4e8
label mauville gym metatiles
2019-06-16 10:08:07 -05:00
DizzyEggg
9e175c9f1b
Merge branch 'master' into battle_engine_v2
2019-06-10 11:21:16 +02:00
DizzyEggg
453be19670
change cooltrainer unused class name
2019-05-25 08:26:40 -05:00
DizzyEggg
a074f36766
USE PROTAG
2019-05-25 08:26:40 -05:00
DizzyEggg
e706280503
Rename PKMN TRAINER CALSS 4
2019-05-25 08:26:40 -05:00
DizzyEggg
76c5287629
Bug Bite
2019-05-23 12:32:14 +02:00
DizzyEggg
e1ea4b62e9
Natural Gift
2019-05-20 12:03:00 +02:00
DizzyEggg
09c0a195ac
Merge branch 'master' into battle_engine_v2
2019-05-20 09:05:12 +02:00
Flametix
dbdb827e54
Fix typos ( #713 )
...
* fix typos
2019-05-18 21:56:19 -05:00
DizzyEggg
a9b4d0208b
Move new species to battle_config.h
2019-05-17 10:38:48 +02:00
DizzyEggg
f22f7866ac
Merge with master, fix conficts
2019-05-17 09:52:20 +02:00
garak
daecd5ec40
name some trainer card related functions
2019-05-16 17:10:13 -05: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
900c15c20c
Mega evo animation
2019-05-03 17:27:49 +02:00
DizzyEggg
a7f2fa67ef
Merge pull request #142 from thechurchofcage/beta
...
Magnetic Flux + Gear Up
2019-05-01 11:11:46 +02:00
DizzyEggg
bbe3a28b78
Merge with master
2019-05-01 11:10:41 +02:00
Fontbane
2c076f1f3e
Doc most OnTransitions
2019-04-22 17:23:59 -05: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
b4e1375bb6
Document pokemon item effects
2019-04-16 11:23:09 -05:00
DizzyEggg
59797e4801
Use constants in battle_anim_special.c
2019-04-14 10:19:50 -05:00
Fontbane
e430fe4b02
Add Dance flag
2019-04-13 21:15:00 -04: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
4e5c543327
Remove new items data from battle engine
2019-04-13 14:02:04 +02:00
DizzyEggg
cf73a3ba28
Merge pull request #126 from thechurchofcage/zeta
...
Ability-ignoring moves
2019-04-08 15:21:08 +02:00
DizzyEggg
0e02c28927
Merge with master
2019-04-08 09:37:41 +02:00
Marcus Huderle
78151b6d88
Start decompiling pokemon_jump.c
2019-04-07 13:12:27 -05:00
Papa Cancer
fc8e59403a
Ability-ignoring moves
...
Just Moongeist Meme and Sunsteel Strike for now. Added a special flag and modified "GetBattlerAbility" to check the current move for it.
2019-04-07 13:03:40 +01:00