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 4e80451d6f5898799ef9b887a068dc1e1a3df56e.
2023-10-09 23:40:38 +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
LOuroboros
35e76e9868
Fixed Ice Spinner, refactored battle terrain text string tables and ditched EFFECT_REMOVE_TERRAIN ( #3247 )
...
Co-authored-by: Alex <alexthenotes@gmail.com>
2023-09-24 00:01:18 -03:00
Alex
a073e7bd59
Adds Gigaton Hammer and Salt Cure ( #3297 )
2023-09-15 11:18:47 -03:00
Eduardo Quezada
f3217c18dc
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# src/battle_util.c
2023-09-14 09:12:12 -03:00
DizzyEggg
7936910f90
Bug Bite - Tests and small fix ( #3282 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-09-14 08:57:30 -03:00
Eduardo Quezada
c9b2a8ae24
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# src/battle_ai_util.c
2023-09-14 08:34:47 -03:00
Alex
ca9e784102
Fixes Toxic Debris + CanTargetFaintAi index issue ( #3306 )
...
* Fixes Toxic Debris + CanTargetFaintAi index issue
* swap macro
2023-09-13 10:31:20 +02:00
Eduardo Quezada
755e260da4
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# include/constants/battle_move_effects.h
# test/battle/move_effect/multi_hit.c
2023-09-10 18:38:46 -03:00
Alex
18577ce598
Fix Scale Shot bug and use Canceller Multihit Moves ( #3290 )
2023-09-10 11:57:19 -03:00
Eduardo Quezada
820113d883
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# data/battle_anim_scripts.s
# data/battle_scripts_1.s
# include/battle_scripts.h
# include/battle_util.h
# src/battle_script_commands.c
# src/battle_util.c
2023-09-07 15:13:06 -03:00
DizzyEggg
cfd802423b
Fling fixes and tests ( #3191 )
...
* begin fling tests
* fling fixes and tests
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* scripts names change
* fix fling's test file
---------
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-09-05 06:56:36 -03:00
Eduardo Quezada
35d7201935
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# data/battle_scripts_1.s
# include/battle_scripts.h
2023-08-31 20:46:53 -04:00
Eduardo Quezada D'Ottone
c4e88760f5
Pret merge (2023/08/31) ( #3268 )
2023-08-31 14:52:18 -04:00
Eduardo Quezada
0d5b00aaf2
Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829
...
# Conflicts:
# README.md
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# data/maps/BattleFrontier_Lounge7/scripts.inc
# include/battle_anim.h
# include/battle_message.h
# include/constants/items.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_anim_throw.c
# src/battle_anim_utility_funcs.c
# src/battle_controller_link_opponent.c
# src/battle_controller_link_partner.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_recorded_player.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/data/party_menu.h
# src/data/pokemon/tmhm_learnsets.h
# src/daycare.c
# src/field_specials.c
# src/hall_of_fame.c
# src/party_menu.c
# src/pokemon.c
# src/tv.c
2023-08-31 14:28:01 -04:00
LOuroboros
d78d63e537
Fixed redundant calls in Teleport's battle script ( #3212 )
...
The battle script was originally making an extra call to attackcanceler and attackstring pointlessly whenever there was a jump to BattleScript_EffectBatonPass.
This commit addresses that by relocating BattleScript_EffectTeleport's own calls to attackcanceler and attackstring.
2023-08-31 09:07:06 +02:00
kittenchilly
f95b4fdb4c
Merge branch 'upcoming' into ultraburst
2023-08-17 13:25:00 -05:00
Eduardo Quezada
a6dbb68bac
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# data/battle_scripts_1.s
# src/battle_util.c
# src/battle_z_move.c
2023-08-17 13:42:09 -04:00
LOuroboros
2d45b9b8fe
Corrected conditionals used for B_SPEED_BUFFING_RAPID_SPIN and I_GEM_BOOST_POWER ( #3232 )
2023-08-14 16:14:12 -04:00
kittenchilly
5e8caa8d45
Merge branch 'upcoming' into ultraburst
2023-08-12 12:36:11 -05:00
Eduardo Quezada
952bacd858
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# .github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
# .github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
# .github/ISSUE_TEMPLATE/04_other_errors.yaml
2023-08-11 17:50:28 -04:00
Eduardo Quezada D'Ottone
1ba70a46f2
Fixed Jump Kick's recoil not happening after Spiky Shield's damage ( #3208 )
...
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
2023-08-11 17:26:43 -04:00
Eduardo Quezada
33b16cb82d
2nd pass
2023-08-11 16:55:27 -04:00
kittenchilly
c3e31af5f3
Ultra burst trigger
2023-08-09 22:12:26 -05:00
Eduardo Quezada
8a3eaadf7b
Renamed "ButItFailed" script name to align with names below it
2023-08-08 08:58:57 -04:00
Alex
42992ca5ce
Fix Teleport ending trainer battles ( #3166 )
2023-08-07 11:23:12 -04:00
Alex
8ee3a3c5bb
solve conflics
2023-08-07 14:25:30 +02:00
ghoulslash
4ae6ae4de3
Reset all battler IDs at battle start ( #3111 )
...
* reset battler IDs before BattleScript_OverworldTerrain and BattleScript_OverworldWeatherStarts to prevent playanimation from executing on invalid battler ids
* replace BS_SCRIPTING with BS_BATTLER_0 in BattleScript_OverworldTerrain and BattleScript_OverworldWeatherStarts
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2023-08-04 08:57:06 +02:00
Eduardo Quezada
f94efa94e1
Merge branch 'RHH/master' into RHH/upcoming
2023-08-02 01:18:07 -04:00
ghoulslash
7a814999e5
MOVE_CORROSIVE_GAS Effect ( #3152 )
...
# Conflicts:
# data/battle_anim_scripts.s
# data/battle_scripts_1.s
# include/constants/battle_move_effects.h
2023-08-02 01:05:54 -04:00
Eduardo Quezada
87050d8c08
Fix Stamina/Wind Power/Electromorphosis/Rattled issues with targets ( #3143 )
2023-08-01 23:54:04 -04:00
DizzyEggg
5eec3b2fc3
fix various issues with primal weather blocking water/fire type moves ( #3138 )
...
* fix various issues with primal weather blocking water/fire type moves
* forgot to change return to effect=1
* fix bugs
2023-07-30 10:50:51 -04:00
Alex
bca29d8586
Adds Mortal Spin and Population Bomb
2023-07-26 17:37:56 +02:00
Eduardo Quezada
47cea526ec
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# src/battle_util.c
2023-07-19 23:22:07 -04:00
Alex
6b5d1e7577
Adds some gen9 moves ( #3147 )
...
* Adds some gen9 moves
* Fix Test + Tabs
* Collision Course boost changed to 1.3333
2023-07-19 13:25:20 +02:00
DizzyEggg
c0f10623d6
Merge branch 'be/staminafix' of https://github.com/ghoulslash/pokeemerald into stamina_fix
2023-07-17 15:35:40 +02:00
DizzyEggg
1f1d24b3e4
Fix Primal Reversion not activating when switching in after fainting ( #3141 )
...
* Fixed Primal Reversion not activating when switching in after a fainting
* add tests for primal reversion
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2023-07-16 12:26:54 +01:00
Martin Griffin
17f8f50a59
Merge remote-tracking branch 'rhh/master' into upcoming
2023-07-16 07:46:34 +01:00
DizzyEggg
381aa58587
Fix Bad Dreams ability pop-up + tests ( #3131 )
...
* Fix all bad dreams issues and add tests
Co-authored-by: ShaeTsuPog <shaetsu@protonmail.com>
2023-07-16 06:38:00 +01:00
Eduardo Quezada D'Ottone
1fa9a05470
Convert move flags and bans into GCC bitfields ( #2952 )
...
* Slicing moves to new bitfield
* Wind moves to new bitfield
* Two-strike moves to new bitfield
* Forgot to add flagTwoStrikes to battle_moves.h
* Removed "flag" from field names
* FLAG_HIT_IN_SUBSTITUTE and FLAG_THAW_USER
* Airborne moves
* FLAG_POWDER, FLAG_TARGET_ABILITY_IGNORED and FLAG_DANCE
* FLAG_BALLISTIC and FLAG_PROTECTION_MOVE
* Fixed missing uses of MOVE_UNAVAILABLE in battle_ai_util.c
* FLAG_SOUND
* FLAG_DMG_UNDERGROUND and FLAG_DMG_UNDERWATER
* FLAG_DMG_MINIMIZE
* Cleanup
* FLAG_STAT_STAGES_IGNORED
* Updated Pollen Puff's ballistic flag
* FLAG_STRONG_JAW_BOOST and FLAG_MEGA_LAUNCHER_BOOST
* thaw
* FLAG_THREE_STRIKES
* FLAG_IRON_FIST_BOOST
* FLAG_RECKLESS_BOOST
* FLAG_HIGH_CRIT
* Removed empty flags
* Moves that fail when called by Me First + added missing Shell Trap
* Moves that fail when Gravity is active
* Better names for banned fields
* Moves that fail when called by Instruct
* Cleanup
* Contact Moves + Fixed Wandering Spirit skipping contact checks
* Inverted FLAG_PROTECT_AFFECTED so that there's a flag for moves that SKIP protect.
* Simplified B_MOVE_FLAGS configs
* FORBIDDEN_METRONOME
* Renamed hitsPastSubstitute to ignoresSubstitute
* FORBIDDEN_PARENTAL_BOND
* Struggle uncallable by Metronome
* FORBIDDEN_MIMIC
* FLAG_KINGS_ROCK_AFFECTED
* Made a single config for move flags
* Macro for checking move flags
* FLAG_MAGIC_COAT_AFFECTED
* Fixed HasMagicCoatAffectedMove
* FLAG_SNATCH_AFFECTED
* Removed unused EFFECT_FLINCH_MINIMIZE_HIT
* Fixed Stench/King's Rock interaction
* Removed sMovesNotAffectedByStench in favor of checking move effects
* Removed EFFECT_TWISTER, which was a repeat of EFFECT_FLINCH_HIT
* Changed Gen2 configs to less than Gen 3
* FORBIDDEN_SLEEP_TALK
* Cleanup
* Inverted FLAG_MIRROR_MOVE_AFFECTED
* FLAG_SHEER_FORCE_BOOST
* Ordered
* FORBIDDEN_ASSIST and FORBIDDEN_COPYCAT
* Removed TestMoveFlags and TestMoveFlagsInMoveset + flags field
* Fixed Triple Arrows test
2023-07-03 10:01:59 +02:00
hetoord
40a5995ead
Teatime tests and fixes ( #3096 )
2023-07-03 09:54:43 +02:00
Eduardo Quezada
2c4a9b754d
Merge branch 'RHH/master' into RHH/upcoming
2023-06-30 16:14:57 -04:00
ghoulslash
304fc4c5b5
Fix disobedience wrong move effect issue ( #3089 )
2023-06-30 09:03:18 -04:00
