Commit Graph

202 Commits

Author SHA1 Message Date
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
DizzyEggg
6f31314c4a Fix uturn typo in test 2023-07-26 09:42:29 +02:00
DizzyEggg
a3d6e31227 Merge branch 'rattled' into stamina_fix 2023-07-26 09:36:46 +02:00
Eduardo Quezada
ad78dfcf68 Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
#	src/battle_script_commands.c
#	src/battle_util.c
2023-07-25 14:38:53 -04:00
Alex
da9b421ae1
Fix Ruin ability calcs (#3171) 2023-07-25 09:59:26 +02:00
Martin Griffin
6f40d44a23 Cleanup RandomUniform and RandomElementArray 2023-07-23 10:24:58 +01:00
Martin Griffin
fc321965a9 RNG_HITS and RNG_LOADED_DICE 2023-07-23 10:24:58 +01:00
Martin Griffin
b406a9c1bd RandomUniformExcept and RNG_METRONOME 2023-07-20 10:25:03 +01: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
34beb3d662 add tests for rattled 2023-07-19 10:59:36 +02:00
Eduardo Quezada D'Ottone
b08c8f85fc
Fixed Utility Umbrella damage calculations (#2835)
* Fixed Utility Umbrella holders not receiving regular damage when being hurt by what would've been weakened rain/sun attacks

* Fixed reading move incorrectly

* Tests: Sun, Rain, Utility Umbrella and Hydro Steam

* [STASH] Skeli changes, needs to remake tests

* Fixed tests

* Removed redundant tests

* Removed unused variable

* Removed Primal Todo tests
2023-07-18 09:22:05 +02:00
Eduardo Quezada D'Ottone
43ad1a4d3b
Unified multi-strike move flags (#3126)
* Unified twoStrikes and threeStrikes flags into strikeCount

* Decreased strikeCount max from 255 to 15.
2023-07-18 09:07:14 +02:00
Alex
38655b9d1f
Fix gem boost on multi hit moves and config for gem param (#3144) 2023-07-18 06:11:54 +01:00
DizzyEggg
04feba8314 test for electromorphosis, small fix for wind power 2023-07-17 16:30:59 +02:00
DizzyEggg
1b6f582600 tests for stamina/wind power 2023-07-17 15:33:44 +02:00
Alex
330e20b9e9
Fix Protosynthesis and Quark Drive boosts (#3139)
* Fix Protosynthesis and Quark Drive boosts

* Added Tests + fix newly introduced bug in the PR

Add unintentionally deletet break

new line
2023-07-17 11:10:13 +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
Martin Griffin
c4057cb0e0
Fix Metronome's/Mirror Move's called move to take powder moves / multi hit moves into account (#3135) 2023-07-16 06:41:18 +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
786bf7752f Merge branch 'RHH/master' into RHH/upcoming 2023-07-16 01:33:30 -04:00
DizzyEggg
2a249654e7 fix mirror move/metronome powder/multi hit moves & tests 2023-07-15 14:00:55 +02:00
Martin Griffin
25986be089 Prevent corrupted heaps causing infinite loops 2023-07-15 11:48:53 +01:00
Martin Griffin
4637d7e7ee Recover from test crashes 2023-07-15 11:48:52 +01:00
Martin Griffin
b31f10d124
Make Hydra respect -jN (#3132) 2023-07-14 19:10:42 +02:00
Eduardo Quezada
168b005406 Merge branch 'RHH/master' into RHH/upcoming 2023-07-14 12:40:01 -04:00
Eduardo Quezada D'Ottone
5f29ae6f99
Failed tests are now listed in the total (#3073)
* Failed tests are now listed in the total
2023-07-14 10:17:54 +01:00
sbird
6482279fa3 [battle, math] refactor damage calculation to use proper fp type and inlined multiplication 2023-07-07 18:51:23 +02:00
Eduardo Quezada
4bbb3a1e51 Merge branch 'RHH/master' into RHH/upcoming 2023-07-05 19:28:37 -04:00
Martin Griffin
eab4e32e2a
Shuffle implementation (#3097) 2023-07-05 19:46:40 +02:00
Eduardo Quezada D'Ottone
81522554c2
Fixed KNOWN_FAILING tests running memory leak checks when unneeded (#3102) 2023-07-04 17:19:38 +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
Eduardo Quezada D'Ottone
81e59ace25
Cleaned up remaining Castform hack stuff (#3063)
* Removed gCastformFrontSpriteCoords

* Removed sCastformElevations and IsCastformForm

* Removed sCastformBackSpriteYCoords and castformPalette in BattleStruct

* Scrubbed unused BS commands

* Removed B_ANIM_CASTFORM_CHANGE and BattleForm constants

* Removed redundant function in Pokémon Debug menu

* Removed handling in animation scripts

* Removed gBattleMonForms

* Reduced MAX_MON_PIC_FRAMES to 2

* Removed Castform/Cherrim makefile stuff

* Fixed weather form change tests not checking species.

* Fixed Castform palettes after Lunos' PR
2023-06-30 09:58:07 +02:00
Alex
20099274d8
Fix Clear Amulet visual bug + Tests (#3074)
* Fix Clear Amulet visual bug + Tests

TODO Tests, additional tests + Triple Kick pp bug

* Wonder Guard message, switch instead of if, misalignments
2023-06-28 12:26:03 -04:00
Eduardo Quezada
f9bf91a2f0 Merge branch 'RHH/master' into RHH/upcoming 2023-06-26 18:09:53 -04:00
Eduardo Quezada D'Ottone
f3be4e1ac5
Fixed 2 test runner issues (#3076)
* Fixed 2 test runner issues

Thanks to MGriffin for the help
- Fixed non-battle tests omitting errors when failing.
- Fixed non-battle tests showing false positive memory leak errors due to the test failing for a different cause.

* Update test/test_runner.c

Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2023-06-26 19:26:42 +01:00
hetoord
4a6f791482
Tests for Air Balloon (#3071)
* Add tests for HOLD_EFFECT_AIR_BALLOON

* Apply suggestions from code review

---------

Co-authored-by: Bart <bart@DESKTOP-IKF42MG.localdomain>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-06-26 08:37:48 -04:00
Martin Griffin
8995296db4 Use ; instead of {} for empty PLAYER/OPPONENT 2023-06-23 15:09:41 +01:00
Martin Griffin
1987bda497 Regularize whitespace in tests 2023-06-23 15:09:41 +01:00
Martin Griffin
b90ff23b80 I_HEALTH_RECOVERY in item_effect_restore_hp.c 2023-06-23 15:09:41 +01:00
Martin Griffin
0d930946a7 Parametrize item_effect_restore_hp.c 2023-06-23 15:09:41 +01:00
Martin Griffin
b357d5b1b8 Inline uses of macros in tests 2023-06-23 15:09:41 +01:00
Martin Griffin
0b43f5ab0e Use 3-arg PASSES_RANDOMLY in Snow+Blizzard 2023-06-22 17:20:39 +01:00
Martin Griffin
c9a2c86d78 Simplify TO_DO_BATTLE_TEST 2023-06-22 15:19:35 +01:00