DizzyEggg
|
877e3fd6af
|
merge with upcoming
|
2023-02-22 19:27:42 +01:00 |
|
DizzyEggg
|
e0b76e98ff
|
Add MOVE_SHELL_TRAP Effect (#2716)
* implemented Shell Trap
Co-authored-by: AgustinGDLV <agustingomezdelavega@gmail.com>
|
2023-02-22 13:55:34 +00:00 |
|
Jaizu
|
403a6f4544
|
Merge pull request #2712 from DizzyEggg/fix_abilities_empty_field
Fix switch-in abilities activating on an empty field
|
2023-02-22 09:49:13 +01:00 |
|
DizzyEggg
|
31138455de
|
remove unneeded VARIOUS_JUMP_IF_NO_VALID_TARGETS
|
2023-02-22 09:28:12 +01:00 |
|
DizzyEggg
|
d73ab0246f
|
Fix Explosion + Galvanize + Volt Absorb and Mind Blown (#2688)
* Fix Explosion and Mind Blown
* Use battler ability in jumpifabilitypresent
|
2023-02-21 22:50:29 +00:00 |
|
Martin Griffin
|
29c64c82f3
|
Test Red Card
Dragon Tail activates Red Card if the target does not switch.
|
2023-02-21 10:44:58 +00:00 |
|
Martin Griffin
|
afe09e9653
|
Test Dragon Tail
Remove the "But it failed!" message if the foe cannot be switched.
|
2023-02-21 10:43:57 +00:00 |
|
DizzyEggg
|
53180ebf87
|
Update Healing wish to gen5 / gen8 mechanics (#2708)
* Updated Healing Wish and added config
* Fixed Lunar Dance message
Co-authored-by: AgustinGDLV <agustingomezdelavega@gmail.com>
Co-authored-by: AgustinGDLV <103095241+AgustinGDLV@users.noreply.github.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
|
2023-02-20 11:25:43 +00:00 |
|
ghoulslash
|
4b64433816
|
Add Battle Anim cmds for dynamic Task, Sprite creation + Misc. Anim Fixes (#2649)
* add createvisualtaskontargets, createspriteontargets to fix electroweb, fiery wrath anims
* add missing semicolon
* add Cmd_createspriteontargets_onpos for heal block, fix heal block targeting
* remove duplicate func
* improve origin pulse anim
* fix IsDoubleBattle call
* venom drench acid uses average battler positions
* add GetSubpriorityForMoveAnim
* add GetBattleAnimMoveTargets for CreateSpriteOnTargets and Cmd_createvisualtaskontargets
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2023-02-19 11:48:12 +01:00 |
|
DizzyEggg
|
66d2f253a1
|
merge with master
|
2023-02-17 15:43:15 +01:00 |
|
DizzyEggg
|
0c523f9518
|
Fix Magic bounce powder moves against grass types (#2633)
* Fix Magic bounce powder moves against grass types
|
2023-02-17 13:55:51 +00:00 |
|
DizzyEggg
|
56c9564e7a
|
8th gen Howl's effect (#2700)
* Howl gen8 effect
|
2023-02-17 10:28:46 +00:00 |
|
Eduardo Quezada D'Ottone
|
625a7622e2
|
Merge pull request #2697 from AsparagusEduardo/RHH/sync/pret_20230214
It's ya boi, pret merge! (pret merge 2023/02/16)
|
2023-02-16 21:57:41 -03:00 |
|
ghoulslash
|
6b0b427d93
|
Merge pull request #2680 from DizzyEggg/mirror_armor
Fix Mirror Armor against Clear Body
|
2023-02-16 09:29:04 -05:00 |
|
ghoulslash
|
60a3da5811
|
Merge pull request #2691 from DizzyEggg/clang_scales
Fix Clanging Scales target and effect
|
2023-02-16 09:13:33 -05:00 |
|
DizzyEggg
|
4c18ed2bd4
|
remove comment
|
2023-02-16 15:11:48 +01:00 |
|
ghoulslash
|
8c81cf1e66
|
Merge pull request #2692 from DizzyEggg/shields_down
Fix Shield Down Ability pop-up
|
2023-02-16 09:11:24 -05:00 |
|
DizzyEggg
|
1c970afd6a
|
fix follow me working in singles (#2644)
* fix follow me working in singles
|
2023-02-16 10:53:29 +01:00 |
|
DizzyEggg
|
f6a0c882d1
|
Fix Shield Down Ability pop-up
|
2023-02-15 23:44:00 +01:00 |
|
DizzyEggg
|
94651e77a5
|
Fix Clang Scales target and effect
|
2023-02-15 22:18:18 +01:00 |
|
Eduardo Quezada
|
b62e5aa72e
|
Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214
# Conflicts:
# src/battle_main.c
# src/field_specials.c
# src/trade.c
|
2023-02-15 14:11:03 -03:00 |
|
ghoulslash
|
908b509401
|
Fix Round's Base Power calc, Add Turn order effects (#2602)
* fix round base power calc, add turn order change
* remove unused callnative cmd
* fix round turn order update
* fix moveTarget getting set incorrectly in HandleAction_UseMove. also redirection doesn't affect MOVE_TARGET_ALL_BATTLERS
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2023-02-14 16:49:50 +01:00 |
|
DizzyEggg
|
0577d8d04d
|
Fix Mirror Armor against Clear Body
|
2023-02-13 14:44:34 +01:00 |
|
DizzyEggg
|
5d958e245a
|
Merge pull request #2669 from Jaizu/giga_impact_contests
Fix Giga Impact on contests.
|
2023-02-13 09:22:24 +01:00 |
|
DizzyEggg
|
513ecd50ba
|
Fix Spacial Rend animation
|
2023-02-09 13:24:23 +01:00 |
|
Jaizu
|
9f7267e48d
|
Fix Giga Impact on contests.
|
2023-02-09 11:29:29 +01:00 |
|
DizzyEggg
|
896b575c07
|
Fix volt switch breaking ace pokemon
|
2023-02-08 12:42:38 +01:00 |
|
DizzyEggg
|
ff088752e7
|
Insomnia ability pop-up (#2643)
* Insomnia ability pop-up
* remove B_MSG_STAYED_AWAKE_USING constant
|
2023-02-07 18:47:23 +01:00 |
|
ghoulslash
|
7e9d40d401
|
Merge pull request #2645 from DizzyEggg/damp_aftermath
Damp shows ability pop-up when reacting with Aftermath
|
2023-02-07 10:18:23 -05:00 |
|
DizzyEggg
|
dcb63e1518
|
Merge pull request #2610 from ghoulslash/be/animsilktrap
Silk trap Animation
|
2023-02-07 16:13:53 +01:00 |
|
ghoulslash
|
a775f6f31a
|
Merge pull request #2642 from AlexOn1ine/strange_steam_v2
Fix Strange Steam anim
|
2023-02-07 09:25:04 -05:00 |
|
DizzyEggg
|
0dc5e1e685
|
aftermath damp pop-ups and string
|
2023-02-07 13:01:56 +01:00 |
|
ghoulslash
|
0c4c3fbbb7
|
Fix Poison Gas Anim for MOVE_TARGET_BOTH (#2608)
* poison gas anim handles MOVE_TARGET_BOTH
* fix sprite position fields
* fix it again
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2023-02-07 12:14:36 +01:00 |
|
Alex
|
2f412b206a
|
Fix Strange Steam anim
|
2023-02-07 00:40:37 +01:00 |
|
DizzyEggg
|
04ce8ec213
|
Fix Volt Absorb not activating on Thunderwave
|
2023-02-06 20:55:56 +01:00 |
|
GriffinR
|
9003966fcc
|
Misc field_specials cleanup
|
2023-02-01 11:48:55 -05:00 |
|
ghoulslash
|
3f616215ea
|
add silk trap anim
|
2023-01-28 09:03:18 -05:00 |
|
Martin Griffin
|
a13ffdbfba
|
U-turn does not switch the user out if Emergency Exit activates
|
2023-01-27 00:57:22 +00:00 |
|
Eduardo Quezada
|
7774c9727d
|
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230125
# Conflicts:
# tools/mapjson/mapjson.cpp
|
2023-01-25 20:28:55 -03:00 |
|
Eduardo Quezada D'Ottone
|
1bfc922c72
|
Merge pull request #2471 from ghoulslash/be/gen9items
Start Gen9 Hold Effects
|
2023-01-23 14:58:08 -03:00 |
|
Eduardo Quezada D'Ottone
|
2b22bdf1e7
|
Merge pull request #2579 from LOuroboros/allahu
Fixed Explosion & Intimidate's 'interaction'
|
2023-01-23 11:37:06 -03:00 |
|
ghoulslash
|
f97ec1975a
|
merge w upcoming
|
2023-01-23 09:24:03 -05:00 |
|
GriffinR
|
29c1af50ca
|
Fix Best Streak stat name
|
2023-01-20 11:25:04 -05:00 |
|
Eduardo Quezada
|
4a9515e8db
|
Restored improvements from upstream
|
2023-01-20 12:34:15 -03:00 |
|
Eduardo Quezada
|
749225ace1
|
Matching merge from upstream pret
# Conflicts:
# graphics/interface/menu_info.png
# include/pokemon.h
# src/battle_ai_switch_items.c
# src/battle_anim_mons.c
# src/battle_anim_water.c
# src/battle_controller_opponent.c
# src/battle_gfx_sfx_util.c
# src/battle_main.c
# src/battle_pike.c
# src/battle_script_commands.c
# src/data/pokemon/species_info.h
# src/pokemon.c
# src/pokemon_summary_screen.c
|
2023-01-20 12:31:54 -03:00 |
|
GriffinR
|
b7d92e8537
|
Revert incorrect constant usage, add new correct ones
|
2023-01-18 12:11:09 -05:00 |
|
GriffinR
|
5a906c33ac
|
Merge branch 'master' into sync_battle_anim_args
|
2023-01-18 11:47:33 -05:00 |
|
LOuroboros
|
773e7f0de2
|
Fixed Explosion & Intimidate's 'interaction'
|
2023-01-17 22:16:42 -03:00 |
|
GriffinR
|
c663154760
|
Merge pull request #1836 from GriffinRichards/fix-clone
Add fix for Battle Tower cloning bug
|
2023-01-15 00:32:24 -05:00 |
|
LOuroboros
|
bdcc84f019
|
Updated the implementation
|
2023-01-09 15:18:22 -03:00 |
|