Eduardo Quezada
|
7ce68994ec
|
Made Mega Evolution properly use TryBattleFormChange
|
2023-03-12 02:32:09 -03:00 |
|
Eduardo Quezada
|
4625a46748
|
Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange
# Conflicts:
# src/battle_interface.c
# src/battle_main.c
# src/battle_script_commands.c
# src/battle_util.c
|
2023-03-07 11:26:33 -03:00 |
|
Eduardo Quezada D'Ottone
|
81a80e566c
|
Refactor Mega Evolution indicator sprite (#2805)
|
2023-03-07 08:06:28 -03:00 |
|
DizzyEggg
|
a04046dbb6
|
Add tests for Defog and fix Defog battle strings (#2737)
* start working on defog tests
* defog tests + improve terrain end battlescripts
* newline
|
2023-03-06 20:35:08 +01:00 |
|
DizzyEggg
|
306c4565a0
|
merge
|
2023-03-06 15:32:28 +01:00 |
|
Eduardo Quezada D'Ottone
|
b3ffc9d1c4
|
Set link tutorial as complete when using Cheat Start (#2802)
|
2023-03-06 09:29:34 +01:00 |
|
ghoulslash
|
dec1b16138
|
Swallow/Spit Up Gen 5 Behavior and tests for Swallow/Spit Up/Stockpile (#2790)
|
2023-03-05 09:50:47 -05:00 |
|
Eduardo Quezada
|
9917f5cc8b
|
Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303
# Conflicts:
# Makefile
# include/constants/pokemon.h
# include/pokemon.h
# make_tools.mk
# src/battle_ai_script_commands.c
# src/battle_controllers.c
# src/battle_main.c
# src/battle_script_commands.c
# src/party_menu.c
# src/pokemon.c
# src/trade.c
# src/trainer_pokemon_sprites.c
|
2023-03-03 11:00:50 -03:00 |
|
ghoulslash
|
4e138fa4b7
|
Fix wrong Contrary message when affected by Intimidate (#2723)
|
2023-03-02 09:38:00 -05:00 |
|
GriffinR
|
ec89e519f9
|
Merge pull request #1858 from AsparagusEduardo/pret/doc/fateful
Rename eventLegal to modernFatefulEncounter
|
2023-02-28 11:48:34 -05:00 |
|
DizzyEggg
|
c92a65dc40
|
Add config for stockpile raising def stats
|
2023-02-27 21:09:02 +01:00 |
|
DizzyEggg
|
3338a6b786
|
add messages for stockpile effects wear off
|
2023-02-27 12:31:29 +01:00 |
|
AgustinGDLV
|
e537be76ea
|
Z-moves bypass protection (#2730)
|
2023-02-27 09:17:07 +01:00 |
|
DizzyEggg
|
44d2cc7232
|
Fix bugs related to Trainer Slide messages (#2699)
* start working on trainer slides
* use cmd->nextInstr
|
2023-02-27 09:11:25 +01:00 |
|
Eduardo Quezada
|
41bf9ea63c
|
Removed trailing whitespaces
|
2023-02-26 18:43:15 -03:00 |
|
DizzyEggg
|
8ccffa617a
|
fix createspriteontargets on electricy anim
|
2023-02-26 19:47:44 +01:00 |
|
DizzyEggg
|
4bdca43dbd
|
refactor mega evolution indicator sprite
|
2023-02-26 12:51:35 +01:00 |
|
Zunawe
|
f376b71f7c
|
Fix wrong route in item flag name
|
2023-02-25 13:48:39 -08:00 |
|
ghoulslash
|
827bf11307
|
Merge pull request #2660 from DizzyEggg/ace_voltswitch
Fix Volt Switch / Roar with ace pokemon
|
2023-02-23 09:20:18 -05:00 |
|
DizzyEggg
|
dc83708443
|
Remove unused script BattleScript_TargetAbilityStatRaiseOnMoveEnd
|
2023-02-22 22:51:59 +01:00 |
|
Zunawe
|
60be59d18b
|
Fix wrong route in hidden item flag name
|
2023-02-22 13:13:57 -08:00 |
|
DizzyEggg
|
877e3fd6af
|
merge with upcoming
|
2023-02-22 19:27:42 +01:00 |
|
DizzyEggg
|
460dceb48b
|
fix intimidate derp
|
2023-02-22 19:20:18 +01:00 |
|
DizzyEggg
|
83281944fa
|
Add tests for Contrary
|
2023-02-22 16:24:27 +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 |
|
DizzyEggg
|
64e26f5c86
|
Fix Contrary String on Intimidate
|
2023-02-22 13:11:16 +01: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 |
|
Eduardo Quezada
|
5ca9213d07
|
Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange
# Conflicts:
# src/battle_script_commands.c
|
2023-02-21 17:47:02 -03: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 |
|
Zunawe
|
8f74a6777a
|
Fix spelling mistake for item flag
|
2023-02-20 18:17:30 -08: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 |
|
Eduardo Quezada
|
f4f8ab6ee9
|
Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange
|
2023-02-16 17:06:49 -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 |
|
Eduardo Quezada
|
bd54990333
|
Review changes
|
2023-02-15 13:56:11 -03:00 |
|
GriffinR
|
69fdf0faa4
|
Merge pull request #1853 from GriffinRichards/doc-contest-bar
Clarify AI_CV_AttackDown_UnknownTypeList
|
2023-02-15 11:29:57 -05:00 |
|