Eduardo Quezada
09fc48461f
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# test/battle/move_flags/three_strikes.c
# test/move_flag_strike_count.c
# test/move_flag_three_strikes.c
# test/powder_moves.c
# test/status1.c
2023-08-12 16:31:44 -04:00
Eduardo Quezada D'Ottone
d62c0d6d51
Organized tests into subfolders ( #2822 )
2023-08-12 20:00:15 +01:00
kittenchilly
5e8caa8d45
Merge branch 'upcoming' into ultraburst
2023-08-12 12:36:11 -05:00
kittenchilly
2b27b0bf00
Constants
2023-08-12 12:30:36 -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
ada29313de
Fix for wild double battles with an in-game partner ( #3210 )
...
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
2023-08-11 17:29:10 -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
Philipp AUER
59da940283
Refactor damage formula to match Gen5+ ( #3196 )
...
* [battle, damage] refactor damage formula to match gen5+
* [test] use exact values for dry skin, swarm tests
* fixup: assume stats for dry-skin, swarm tests
---------
Co-authored-by: sbird <sbird@no.tld>
2023-08-11 16:28:38 -04:00
kittenchilly
063d83b58e
Fix build
2023-08-11 14:01:45 -05:00
kittenchilly
c3a8edae32
Sprites and fixes
2023-08-11 13:36:01 -05:00
Eduardo Quezada D'Ottone
bd7960ef21
Updated versions for issue templates ( #3220 )
2023-08-11 12:04:03 -04:00
Eduardo Quezada
f026b51b48
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/cleanup/customTrainer
...
# Conflicts:
# src/battle_main.c
# src/battle_tower.c
# src/match_call.c
2023-08-11 11:41:44 -04:00
Alex
bcb6f723d9
Use AI_DATA->holdEffects instead AI_GetHoldEffect
2023-08-10 16:24:29 +02:00
Alex
275e5ef5e6
Make more use of AI_GetHoldEffect + Fake Out changes
...
fix ShouldTryToFlinch
fix some mess up
fix of fix of mess up
2023-08-10 15:33:12 +02:00
kittenchilly
c3e31af5f3
Ultra burst trigger
2023-08-09 22:12:26 -05:00
Martin Griffin
f6e6a1f383
Initialize save to empty in test runner ( #3215 )
2023-08-09 10:06:03 -04:00
DizzyEggg
be0861b746
Update src/battle_ai_main.c
...
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2023-08-08 20:03:19 +02:00
DizzyEggg
f72ec368fc
improve switching with ai bad moves
2023-08-08 12:55:47 +02:00
Alex
42992ca5ce
Fix Teleport ending trainer battles ( #3166 )
2023-08-07 11:23:12 -04:00
DizzyEggg
1fb42e4497
Sticky web / Court Change / Mirror Armor tests + small fixes ( #3160 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Co-authored-by: Martin Griffin <martin.griffin@algosport.co.uk>
2023-08-07 10:27:57 -04:00
Eduardo Quezada D'Ottone
fc66a8c476
Adds Mortal Spin and Population Bomb ( #3178 )
2023-08-07 08:54:18 -04:00
Alex
8ee3a3c5bb
solve conflics
2023-08-07 14:25:30 +02:00
DizzyEggg
ce18df46e6
replace global usage of gActiveBattler in controller files
2023-08-07 12:51:58 +02:00
DizzyEggg
b8ba6139cb
health bar update
2023-08-07 10:29:02 +02:00
DizzyEggg
546b0c7e97
handle move anim
2023-08-07 09:26:03 +02:00
Eduardo Quezada
d74cbca0b9
LF shenanigans
2023-08-06 21:02:16 -04:00
Eduardo Quezada
34d38bdbae
Merge branch 'RHH/master' into RHH/upcoming
2023-08-06 20:31:45 -04:00
Eduardo Quezada
833f7dd9d3
LF shenanigans
2023-08-06 20:25:23 -04:00
DizzyEggg
e8d6c99e6d
more controllers work
2023-08-07 01:05:09 +02:00
DizzyEggg
ef8024d8c5
draw trainer pic
2023-08-06 21:50:59 +02:00
DizzyEggg
a9483c361b
trainer intro ball throw
2023-08-06 12:41:36 +02:00
DizzyEggg
af899c9679
stuff
2023-08-06 00:44:22 +02:00
DizzyEggg
ffb0e20049
hide show party status summary
2023-08-05 23:27:56 +02:00
DizzyEggg
18db0cb3b7
controller string
2023-08-05 22:41:13 +02:00
DizzyEggg
f9e131b6ac
fix recorded, exp update the same for player partner
2023-08-05 21:34:17 +02:00
DizzyEggg
0b4c1aa275
more work on controllers
2023-08-05 20:42:19 +02:00
DizzyEggg
1793b9e1da
more controller functions
2023-08-05 14:11:25 +02:00
DizzyEggg
a505cd7fb9
simplify the get mon set mon data functions more
2023-08-05 12:53:14 +02:00
DizzyEggg
cbebdf044a
handle se, bgm and fainting cry
2023-08-05 12:13:50 +02:00
DizzyEggg
c4bfe40da6
remove empty controller functions
2023-08-05 11:39:42 +02:00
DizzyEggg
5a8b6c18ef
ball throw and start removing empty controller functions
2023-08-05 11:05:37 +02:00
Eclipse
5226935857
Fixed Trainer class ball not assigned to second Pokémon ( #3203 )
2023-08-04 22:56:05 -04:00
DizzyEggg
c72bb27325
faint animation
2023-08-04 22:15:39 +02:00
DizzyEggg
7360a4a18a
up to return mon to ball
2023-08-04 17:29:29 +02:00
DizzyEggg
7ba8a0216f
more work on controllers
2023-08-04 13:42:40 +02:00
ghoulslash
a0dd77dd41
Improve AI switching, so it doesn't get killed on switch-in ( #3146 )
2023-08-04 07:34:58 -04:00
ghoulslash
dc1d44eefd
Updated Cmd_jumpifsideaffecting ( #3200 )
2023-08-04 07:32:54 -04:00
DizzyEggg
cc30d2fb53
start removing duplicate controller functions
2023-08-04 12:10:38 +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
DizzyEggg
e7bc42fcaf
use IsValidForBattle
2023-08-03 21:17:39 +02:00
