2 commits

Author	SHA1	Message	Date
Eduardo Quezada	75ad61e5bf	Merge branch '_RHH/master' into _RHH/upcoming ... # Conflicts: # data/battle_scripts_1.s # include/constants/battle_move_effects.h # src/battle_ai_main.c # src/battle_ai_util.c # src/battle_tv.c # src/data/battle_moves.h # src/data/graphics/pokemon.h	2024-02-19 10:13:13 -03:00
Alex	57e0d7b20b	Partial fix for Teeter Dance and Ability Dancer interaction (#4129) ... * Parial fix for Teeter Dance and Ability Dancer interaction * Removes rest of teeter dance checks and make it work with effect_confuse * Update test/battle/ability/dancer.c Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> * Update test/battle/ability/dancer.c Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> --------- Co-authored-by: Bassoonian <iasperbassoonian@gmail.com> Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2024-02-19 13:36:21 +01:00