ghoulslash
8c4058c7a8
add HITMARKER_DISABLE_ANIMATION for bug bite consumeberry ( #3607 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-11-28 18:57:11 +01:00
Eduardo Quezada
c8b0545d20
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# include/battle.h
2023-11-25 00:51:33 -03:00
Alex
ca39889587
Fixes Howl
2023-11-22 21:55:08 +01:00
Bassoonian
a7beed5b25
Dynamax messages ( #3581 )
...
* Dynamax messages
* Convert various to callnative
* Remove battler argument from callnatives
* Rename i variable
* Fix missing else
2023-11-21 19:18:18 +01:00
Alex
b9edbb429b
Adds combined pledge move effects ( #3336 )
...
* Adds combined pledge move effects
* added pledge status and various other fixes
* leftover
* fix triple arrow test tag
* pledge moves can not be redirected by absorbing abilities
* more pledge changes
* remove duplicate test
* Stab boost, Rainbow anim and new SeaOfFire anim
* leftover
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-11-21 16:23:22 +01:00
Alex
be42d4eafb
Increase score of secondary effects only at 100% chance ( #3583 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-11-21 11:30:20 +01:00
Alex
4cb03d4add
Adds Raging Bull and various fixes ( #3552 )
...
* Adds Raging Bull and various fixes
* fix compiling on abgcc
* syrup bomb anim fix
* sticky syrup anim in link battles
* fix sticky syrup in link battles
* fix battler index
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-11-19 17:45:58 +01:00
Alex
5fa1bffa8d
Adds Glaive Rush, fixes for Plasma Fists and Relic Song ( #3476 )
...
* Adds Glaive Rush
* Fixes: Glaive Rush status is removed until users next turn
* Glaive Rush no affect
* simplify glaive rush script
* simlify script further
* leftover
* Fix Plasma Fists and Relic Song + tests
* Callnative for Plasma Fists
* Use Status Field Ion Deludge for Plasma Fists
* add assumes for flinch_status
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-11-18 15:19:38 +01:00
Alex
4b3c96a89b
Adds ability Zero to Hero ( #3542 )
2023-11-09 08:25:46 -03:00
Alex
954f67a29f
Fixes Dragon Tail and Pumpkaboo spelling ( #3541 )
2023-11-07 18:19:46 +01:00
Alex
64ba52d214
Remove redundant AI score increases ( #3504 )
...
* Remove redundant AI score increases
* review applied
* fix score
2023-10-31 13:41:22 +01:00
Eduardo Quezada D'Ottone
2dfae911aa
Added config for Weak Armor's Gen 5-6 effect ( #3498 )
2023-10-30 17:18:00 -03:00
Eduardo Quezada
e28d0c627a
Merge branch 'RHH/master' into RHH/upcoming
2023-10-30 16:51:04 -03:00
DizzyEggg
72dad4d7c6
Fix Weak Armor interrupting multi hit moves ( #3497 )
2023-10-30 16:44:42 -03:00
Eduardo Quezada
908af87846
Merge branch 'RHH/master' into RHH/upcoming
2023-10-30 11:00:24 -03:00
DizzyEggg
f4be01f0ac
Fix strength sap on substitute ( #3486 )
...
* tests for strenth sap
* fix strength sap on substitute
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2023-10-30 11:58:15 +01:00
Alex
f2fddf4ee1
Syrup Bomb move and special speed drop anim, Credits to Dat.H A ( #3474 )
2023-10-27 19:14:45 -03:00
Alex
f6781a77d4
merge rhh/upcoming
2023-10-25 09:42:19 +02:00
Eduardo Quezada D'Ottone
26971fc3ac
Add species defines for base forms with names ( #3248 )
...
* Fixed Aegislash test not being properly made.
* Added conditions to BattleSetup_StartLegendaryBattle switch
2023-10-23 12:59:15 +01:00
Eduardo Quezada D'Ottone
6585a62b13
Dynamax Cleanup ( #3435 )
...
* Mon animation names
* Moved indicator code so it follows the same standards as the other indicators
* Whitespace
* Fixed modern compile
* Fixed issue that caused Low Key Toxtricity learning Amped moves when Gigantamaxed
2023-10-23 11:39:22 +01:00
Alex
bf56ea8a8b
apply suggestions
2023-10-22 19:46:31 +02:00
Martin Griffin
551dc62085
Added a macro to flush the text box in battles ( #3442 )
2023-10-22 08:26:36 +01:00
Eduardo Quezada
a34c260169
Merge branch 'RHH/master' into RHH/upcoming
2023-10-21 23:59:33 -03:00
Alex
0a6c0261fe
Fixes Make it Rain in double battles ( #3441 )
2023-10-21 23:42:19 +02:00
LOuroboros
620998e68d
Added a macro to flush the text box in battles
2023-10-21 17:28:43 -03:00
kittenchilly
33a0fdbbc6
Add new move flags and update all flags for every move ( #3425 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-10-19 20:16:37 -03:00
Alex
f3580aa3f5
tabs
2023-10-19 21:31:04 +02:00
Alex
ceb6beb254
merge upcoming
2023-10-19 12:30:55 +02:00
Alex
354f84be21
intim changes
2023-10-18 22:14:49 +02:00
Alex
91b6722322
Octolock, more tests
2023-10-18 20:25:34 +02:00
Eduardo Quezada
6e1d4b4409
Fixed compile on modern + tests
2023-10-15 08:32:25 -03:00
Eduardo Quezada
c0540a3559
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
...
# Conflicts:
# include/battle.h
# include/constants/battle_move_effects.h
# include/constants/battle_string_ids.h
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
2023-10-15 00:30:00 -03:00
Eduardo Quezada
3409869f9c
Merge branch 'RHH/master' into RHH/upcoming
2023-10-13 17:44:43 -03:00
Bassoonian
231ebea3f0
Tests for 6 more abilities ( #3399 )
...
* Tests for 6 more abilities
* Fix most of Egg's comments
* Update Purifying Salt and Leaf Guard
* Parenthesis fixes
2023-10-13 20:50:48 +02:00
Alex
6ed8ab771b
Fix Syrup Bomb and change Octolock
2023-10-13 14:08:44 +02:00
Eduardo Quezada
186884120c
Merge branch 'RHH/master' into RHH/upcoming
2023-10-11 13:02:12 -03:00
Eduardo Quezada D'Ottone
eedc61709d
Various tests + Poison Heal fix + Transistor update ( #3385 )
2023-10-11 11:34:20 -03:00
Alex
0b9126ff53
Adds moves Matcha Gotcha, Syrup Bomb and Ivy Cudgel ( #3402 )
...
* initial commit
* done
* clean up
2023-10-11 11:09:50 +02:00
ghoulslash
70fbf9e9df
Opportunist Ability ( #2994 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2023-10-09 22:35:00 -03:00
Alex
36174f12ae
Fixes Salt Cure visual bug if mon fainted by direct attack ( #3388 )
...
* Fixes Salt Cure visual bug if mon fainted by direct attack
* Removes duplicate give all tm/hms in the debug menu
* test
* Revert "Removes duplicate give all tm/hms in the debug menu"
This reverts commit 4e80451d6f
2023-10-09 23:40:38 +02:00
Eduardo Quezada
92301398bc
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
...
# Conflicts:
# asm/macros/battle_script.inc
# data/battle_anim_scripts.s
# data/battle_scripts_1.s
# include/battle.h
# include/battle_controllers.h
# include/battle_interface.h
# include/config/battle.h
# include/constants/battle.h
# include/constants/battle_anim.h
# include/constants/battle_move_effects.h
# include/constants/battle_string_ids.h
# include/data.h
# include/random.h
# sound/cry_tables.inc
# src/battle_anim_new.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/data/pokemon/form_change_table_pointers.h
# src/data/pokemon/species_info.h
# src/data/text/move_names.h
# test/test_runner_battle.c
2023-10-09 16:51:41 -03:00
Bassoonian
9735c5d68e
Defeatist, Gale Wings, Poison Heal, Sap Sipper tests
2023-10-05 23:12:30 +02:00
DizzyEggg
dc119b27c2
Fix Intimidate Contrary in double battles
2023-10-01 19:06:43 +02:00
DizzyEggg
f840f7eb56
Fix Red Card not getting consumed after Sticky Web activation ( #3364 )
2023-10-01 10:35:12 -03:00
DizzyEggg
093c653801
Fixed Berserk gene issue in double battles ( #3363 )
...
* fix berserk gene issue + tests
* Update test/battle/hold_effect/berserk_gene.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/hold_effect/berserk_gene.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* berserk gene review changes
---------
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-10-01 10:25:04 -03:00
Eduardo Quezada
f3a65c0315
Merge branch 'RHH/master' into RHH/upcoming
2023-09-26 09:12:28 -03:00
DizzyEggg
e0e49a9933
Fix protect recoil issue and add tests for protect ( #3321 )
...
* fix protect recoil issue and add tests for protect
* test for #3312 and baneful bunker fix
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* more recoil moves for protect test
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* rename spiky shield test
---------
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-09-26 07:26:23 -03:00
ghoulslash
a2640838c9
Fix Seed Sower changing move targets when triggered in double battles ( #3341 )
...
Fix Seed Sower changing move targets when triggered in double battles
2023-09-24 21:33:29 -04:00
Eduardo Quezada
566ec93492
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# asm/macros/battle_script.inc
# data/battle_scripts_1.s
# include/constants/battle_move_effects.h
# include/constants/battle_script_commands.h
# include/constants/battle_string_ids.h
# src/battle_script_commands.c
# src/data/battle_moves.h
2023-09-24 20:32:45 -03:00
DizzyEggg
1f1308f2f5
merge ghoul fix and correct test
2023-09-24 14:42:27 +02:00
