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
DizzyEggg
8ce919594c
Merge pull request #141 from thechurchofcage/beta
...
Instruct
2019-04-20 21:13:57 +02:00
Papa Cancer
b50007e861
Instruct
...
Re-PR'd due to excess "merges"
2019-04-20 20:11:49 +01:00
DizzyEggg
0b7aef1c94
Merge pull request #140 from thechurchofcage/beta
...
Laser Focus
2019-04-20 21:05:05 +02:00
Papa Cancer
7e99272482
Laser Focus
...
Re-PR'd due to excess "merges"
2019-04-20 20:02:52 +01:00
DizzyEggg
849ed7ff31
Merge pull request #137 from thechurchofcage/beta
...
Throat Chop
2019-04-20 20:48:17 +02: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
DizzyEggg
6f0e2c0838
Merge pull request #135 from thechurchofcage/gamma
...
Core Enforcer
2019-04-20 08:31:44 +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
a7f098d8d1
Merge pull request #131 from Fontbane/patch-7
...
Dance flag
2019-04-14 09:50:55 +02:00
Fontbane
e430fe4b02
Add Dance flag
2019-04-13 21:15:00 -04:00
AJ Fontaine
390a68d4a7
Use Dance Flag
2019-04-13 21:13:04 -04:00
DizzyEggg
31222ef64b
Add held effect debug override
2019-04-13 14:56:26 +02: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
2646f3b26a
Merge with master
2019-04-13 13:42:44 +02:00
DizzyEggg
518f9c0638
Some nonmatchings
2019-04-11 07:02:48 -05:00
DizzyEggg
5bc640da9b
nonmatchings
2019-04-11 07:02:48 -05:00
Marcus Huderle
a65cffef42
Decompile more pokemon_jump.c
2019-04-10 20:34:17 -05:00
Marcus Huderle
8a617c3d94
Decompile more pokemon_jump.c
2019-04-09 19:48:21 -05:00
DizzyEggg
382a29ad40
Update battle_anim_script.inc
2019-04-09 07:19:03 -05:00
DizzyEggg
91aafa2ebc
Heal Block anim with volume change task
2019-04-09 12:49:50 +02:00
huderlem
ce93d3ab9a
Merge pull request #661 from Phlosioneer/contest-ai-cleanup
...
contest & contest_ai cleanup
2019-04-08 17:30:28 -05:00
Sewef
c8ce1a0a1f
Two labels from pokeruby.
2019-04-08 17:30:10 -05:00
Sewef
fff1679bcf
Update .gitignore
2019-04-08 17:30:10 -05:00
Sewef
608245058b
Update charmap.txt
...
French is beautiful. (Lie)
2019-04-08 17:30:10 -05:00
ultima-soul
21722d9931
Fix formatting
2019-04-08 17:29:44 -05:00
ultima-soul
2c432c314a
Match sub_8159308
2019-04-08 17:29:44 -05:00
Phlosioneer
92851ba4e6
Trim headers from pokenav.c
2019-04-08 17:29:07 -05:00
DizzyEggg
1c73e61a2b
Parabolic Charge anim
2019-04-08 16:48:04 +02:00
DizzyEggg
cf73a3ba28
Merge pull request #126 from thechurchofcage/zeta
...
Ability-ignoring moves
2019-04-08 15:21:08 +02:00
DizzyEggg
27d645ad8a
Merge pull request #123 from thechurchofcage/delta
...
Leaf Storm animation
2019-04-08 15:20:09 +02:00
DizzyEggg
9ffa74674c
Merge pull request #125 from thechurchofcage/epsilon
...
Hold Hands fix
2019-04-08 15:19:14 +02:00
DizzyEggg
0e02c28927
Merge with master
2019-04-08 09:37:41 +02:00
Marcus Huderle
a518810c17
Decompile more pokemon_jump.c
2019-04-07 19:23:14 -05:00
Phlosioneer
50350cc2e1
Merge branch 'master' into contest-ai-cleanup
2019-04-07 20:20:22 -04:00
Phlosioneer
be925a438e
Remove debug printing
2019-04-07 19:18:42 -05:00
Phlosioneer
29c986e21e
Fix nonmatching MatchCall_MoveWindow function
2019-04-07 19:18:32 -05:00
huderlem
a4ea0ac816
Merge pull request #645 from Phlosioneer/pokenav-decomp-again
...
Pokenav decomp again
2019-04-07 18:03:32 -05:00
Phlosioneer
8de9c2d912
First round of fixes
2019-04-07 18:31:01 -04:00
Phlosioneer
d352999cd8
Change "navgear" to "pokenav"
2019-04-07 18:10:53 -04:00
Phlosioneer
0dc73b0b3a
Break up pokenav into subfiles
...
The files are separated based on the pokenav resources substruct
ID they use.
2019-04-07 14:40:35 -04: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
Phlosioneer
d84d94e29a
Merge branch 'master' into pokenav-decomp-again
2019-04-07 01:56:36 -04:00
Phlosioneer
ad2a97935e
Document left header system
2019-04-07 01:32:42 -04:00
