Alex
6daea655e5
fix line alignment
2023-10-20 12:33:56 +02:00
Alex
ab6c5bafe9
New function to check ability stat loss
2023-10-20 12:29:55 +02:00
Alex
ceb6beb254
merge upcoming
2023-10-19 12:30:55 +02:00
Alex
876341105b
parantheses
2023-10-19 11:32:58 +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
sbird
b77bc71862
fix -Warray-parameter, -Waddress, -Warray-bounds warnings
...
those are introduced by some compiler between gcc 10 and gcc 13
when using -Wall
2023-10-16 09:36:36 +01:00
DizzyEggg
a7b9d139da
Fix Wall Werrors on modern ( #3412 )
...
* Fix Wall Werror errors
* fix hgss pokedex modern errors
* tests build on modern
* learnset change
* Update src/battle_ai_util.c
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
* Update src/battle_anim_new.c
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
* Update src/debug.c
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
* Update src/debug.c
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
* Update src/pokedex_plus_hgss.c
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
* review changes
* unused cmd args
* various args back
---------
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
2023-10-13 18:39:35 +02:00
Alex
6ed8ab771b
Fix Syrup Bomb and change Octolock
2023-10-13 14:08:44 +02:00
Martin Griffin
311224d32f
Converted most battle preproc ifs to regular ifs ( #3392 )
2023-10-12 15:28:41 +01: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
Eduardo Quezada
d1c672d3ce
Converted most battle preproc ifs to regular ifs
2023-10-08 21:32:15 -03:00
Eduardo Quezada
7c7396c1be
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# src/battle_ai_main.c
2023-10-05 13:31:22 -03:00
Brandon Lourenco
89e4f30867
Roost suppresses the user's Flying-type rather than remove and re-add it. Added tests for EFFECT_ROOST. ( #3258 )
...
* Fixed Roost clearing type3 when used by a pure Flying-type. (Gen 5+)
* Created a test file for Roost.
* Marked tests as TODO for now.
* Added more tests for HP healed and type changing.
* Created a function to handle Roost's Flying suppression when getting a battler's type. Added more tests.
* Added test for not-yet-aquired Flying-type. Fixed/rewrote some other tests.
* Now using GetBattlerType() in most relevant places. Fixed some tests.
* Added tests for interactions between Roost and Delta Stream, type-changing effects, Grassy Terrain healing, Levitate, Air Balloon, Magnet Rise, and Telekinesis.
* Added test for interaction between Roost and Reflect Type.
* Gen 4 tests merged with Gen 5+ tests.
* Removed errant space.
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
---------
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2023-10-05 09:19:29 +02:00
DizzyEggg
be5683e899
AI battle tests + AI logic fixes ( #3361 )
2023-10-04 18:53:29 +01:00
Alex
b18d01878f
Fix Battle/Shell Armor + crit chance Tests ( #3377 )
...
* Fix Battle/Shell Armor + crit chance Tests
* fix typos
* minor record ability change
2023-10-04 16:46:42 +02:00
Eduardo Quezada
ca81aba3b6
Merge branch 'RHH/master' into RHH/upcoming
2023-10-02 14:11:24 -03:00
DizzyEggg
c69d8e0960
Improve how AI chooses damaging moves ( #3199 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-10-01 20:36:57 -03:00
DizzyEggg
10adba3af4
Fixed entry hazards switch in issue ( #3316 )
...
* fix entry hazards switch in issue
* accidental known failing fix
2023-10-01 10:30:41 -03:00
DizzyEggg
8efc34eb7e
flinch tests + protect/flinch fix ( #3345 )
2023-09-30 20:30:28 -03:00
kittenchilly
9f1dbeeead
Pickup Table Refactor ( #3351 )
2023-09-28 17:41:42 -03:00
DizzyEggg
2fcb9bbc9b
Wild battle tests + tests for exp points ( #3342 )
...
* Add WIld Battles to test runner + exp tests
2023-09-27 08:35:05 +01:00
Eduardo Quezada
e1d1236d0b
Merge remote-tracking branch 'RHH_origin/master' into RHH/upcoming
2023-09-26 15:55:32 -03:00
DizzyEggg
0fed4e8912
fix protect tests failing on upcoming ( #3348 )
2023-09-26 15:54:01 -03:00
Eduardo Quezada D'Ottone
de577f955a
Greatly reduce AI lag ( #3308 )
2023-09-26 07:28:18 -03: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
996bc6ba24
Fix order of messages in gen6 exp share ( #3339 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-09-24 17:07:56 -03:00
DizzyEggg
5d77123c50
merge with master
2023-09-24 10:52:41 +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
ghoulslash
b77dec1234
Transform updates AI_PARTY data ( #3295 )
...
* Cmd_transformdataexecution overwrite AI_PARTY data
* remove whitespace
* add RecordAllMoves
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2023-09-23 10:44:30 +02:00
Eduardo Quezada D'Ottone
f564d4492b
GetBattlerHoldEffect usage optimizations ( #3330 )
...
* GetBattlerHoldEffect optimizations
* Type fix
2023-09-21 21:43:52 +02:00
DizzyEggg
74fd561759
merge with upcoming
2023-09-17 11:27:18 +02:00
Alex
a073e7bd59
Adds Gigaton Hammer and Salt Cure ( #3297 )
2023-09-15 11:18:47 -03:00
kittenchilly
4a3ee0db7f
Implement Exp Charm and unevolved Exp multipliers + Exp formula fixes ( #3301 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-09-14 15:37:57 -03:00
DizzyEggg
bb9501449c
final ai optimizations
2023-09-14 11:05:00 +02:00
DizzyEggg
5ea66f3c0c
more optimizations
2023-09-14 00:07:41 +02:00
DizzyEggg
b7d0d37757
fix conflicts
2023-09-13 15:14:09 +02:00
DizzyEggg
94a3e80c8e
Remove redundant side macros/funcs ( #3299 )
...
Co-authored-by: gruxor <gruxor@proton.me>
2023-09-13 09:19:18 -03:00
DizzyEggg
406209f738
score to s32
2023-09-13 09:27:49 +02:00
DizzyEggg
44bd830d2a
optimize dmg calc and ai dmg calc to reduce lag
2023-09-12 23:20:09 +02:00
ghoulslash
582cfb0ae7
Convert various to callnatives - Part 1 ( #3269 )
2023-09-11 09:19:56 -04: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
psf
75d06bb599
Generation 6 Experience Share ( #3276 )
2023-09-07 23:18:18 -03:00
DizzyEggg
dd3334aa82
Battle bond tests and small fix ( #3279 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-09-07 17:23:43 -03:00
Eduardo Quezada
3333395ff7
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/variousGone1
...
# Conflicts:
# include/constants/battle_script_commands.h
# src/battle_script_commands.c
2023-09-07 15:54:55 -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
DizzyEggg
7c2ad314d4
merge with upcoming
2023-09-04 09:40:48 +02:00