atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
13728 commits 2 branches 40 tags 600 MiB
Commit graph

5572 commits

Author SHA1 Message Date
kittenchilly
3755155e9d
Update friendship evo threshold to gen 8+ with config (#3376) 2023-10-22 18:05:54 -03:00
Eduardo Quezada
bcf0377d9a Merge branch 'RHH/master' into RHH/upcoming 2023-10-22 16:30:26 -03:00
kittenchilly
d495e177b9
Add Snow weather animation (#3440) 
* Snow weather animation

* Update battle_anim_scripts.s

* Apply changes from review
 2023-10-22 21:15:07 +02:00
Eduardo Quezada D'Ottone
7fdc4aacda
Fixed Cheat Start not initiating time-based events (#3446) 2023-10-22 21:03:54 +02:00
sbird
196038eaee [pokedex_plus] refactor #if to C if 2023-10-22 03:26:24 +02:00
voloved
ebdf14c620
Push B in wild battle moves to Run (#3362) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-10-21 12:45:40 -03:00
kittenchilly
33a0fdbbc6
Add new move flags and update all flags for every move (#3425) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-10-19 20:16:37 -03:00
Eduardo Quezada D'Ottone
d153947aa2
Merge branch 'upcoming' into dynamax 2023-10-18 19:37:09 -03: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
Eduardo Quezada
ca101e9952 Updated AI to use non-dynamax HP (Leech Seed, Nightmare, Trap Damage, Hail, Sandstorm 2023-10-15 09:42:56 -03:00
Eduardo Quezada
c0540a3559 Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax 
# Conflicts:
#	include/battle.h
#	include/constants/battle_move_effects.h
#	include/constants/battle_string_ids.h
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
 2023-10-15 00:30:00 -03:00
Eduardo Quezada
3409869f9c Merge branch 'RHH/master' into RHH/upcoming 2023-10-13 17:44:43 -03:00
Martin Griffin
45897cefbc
Move battle tests off the heap (#3414) 2023-10-13 16:31:10 -03:00
Bassoonian
231ebea3f0
Tests for 6 more abilities (#3399) 
* Tests for 6 more abilities

* Fix most of Egg's comments

* Update Purifying Salt and Leaf Guard

* Parenthesis fixes
 2023-10-13 20:50:48 +02:00
Martin Griffin
cbdba65218
Move battle tests off the heap (#3413) 
* Catch OOM in tests

* Alias gBattleTestRunnerState with sBackupMapData

Reverts #3398 "Fix Broken Move Anims in Tests" which moved the AI logs
to statically-allocated EWRAM_DATA instead of being part of
gBattleTestRunnerState.
 2023-10-13 20:29:30 +02: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
Martin Griffin
311224d32f
Converted most battle preproc ifs to regular ifs (#3392) 2023-10-12 15:28:41 +01:00
Martin Griffin
f5b149b971
Test improvements (#3408) 
* Run assumptions on all runners

* Make i const in battle tests

This avoids the pitfall of using i in a PARAMETRIZEd test and confusing
the runner.
 2023-10-12 12:14:07 +02:00
Eduardo Quezada
805c65b255 Merge branch 'RHH/master' into RHH/upcoming 2023-10-11 13:14:23 -03:00
Eduardo Quezada
482029d7ec Removed Transistor from master 2023-10-11 13:07:16 -03:00
Eduardo Quezada
186884120c Merge branch 'RHH/master' into RHH/upcoming 2023-10-11 13:02:12 -03:00
Eduardo Quezada D'Ottone
eedc61709d
Various tests + Poison Heal fix + Transistor update (#3385) 2023-10-11 11:34:20 -03: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
kittenchilly
a795148068
Add Pikachu World Cap mini icon (#3401) 2023-10-11 11:02:28 +02:00
DizzyEggg
403326035e
fix broken move anims in tests (#3398) 2023-10-10 22:41:34 -03:00
Eduardo Quezada
3cb29f87a6 gBattleCommunication ids 2023-10-10 19:53:56 -03:00
Eduardo Quezada
4d4d566c2b Undid flag 2023-10-10 18:09:42 -03:00
Eduardo Quezada
f830b0725a GMAX -> GIGANTAMAX 2023-10-10 18:07:12 -03:00
Eduardo Quezada
644fba2db1 Gigantamax Flag 2023-10-10 17:37:18 -03: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
2fac60055f Merge branch 'RHH/master' into RHH/upcoming 2023-10-09 22:08:32 -03:00
Eduardo Quezada
92301398bc Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax 
# Conflicts:
#	asm/macros/battle_script.inc
#	data/battle_anim_scripts.s
#	data/battle_scripts_1.s
#	include/battle.h
#	include/battle_controllers.h
#	include/battle_interface.h
#	include/config/battle.h
#	include/constants/battle.h
#	include/constants/battle_anim.h
#	include/constants/battle_move_effects.h
#	include/constants/battle_string_ids.h
#	include/data.h
#	include/random.h
#	sound/cry_tables.inc
#	src/battle_anim_new.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controller_player_partner.c
#	src/battle_interface.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/data/pokemon/form_change_table_pointers.h
#	src/data/pokemon/species_info.h
#	src/data/text/move_names.h
#	test/test_runner_battle.c
 2023-10-09 16:51:41 -03:00
Eduardo Quezada D'Ottone
68c2c45b52
Fixed VSCode shenanigans (#3383) 2023-10-09 12:20:09 +02:00
Eduardo Quezada D'Ottone
9ed7fe1c94
Made Gen6 exp share easier to understand (#3384) 2023-10-09 12:15:13 +02:00
Eduardo Quezada D'Ottone
25540a7fec
Fixed Rivalry's effect + Tests (#3381) 
- It was doing the opposite if neither attacker or target were genderless
- It wasn't accounting for genderless mon
 2023-10-09 12:14:18 +02:00
Eduardo Quezada
d1c672d3ce Converted most battle preproc ifs to regular ifs 2023-10-08 21:32:15 -03:00
kittenchilly
b5f7a51351
Add Teal Mask item, move, and ability data (#3349) 2023-10-08 15:56:09 -03:00
Petuuuhhh
fd19c261d2
Add calculation boosts for Light Ball and Sandstorm (#3387) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-10-07 22:30:16 -03:00
Alex
28506b4cf8
Use move flags instead of lists for AI calcs (#3389) 2023-10-07 18:31:25 +01:00
Bassoonian
cee84f0f74 Fix issues and add more ability tests 2023-10-06 15:13:26 +02: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
kittenchilly
ab8bc6e493
Add new sell value of 1/4 of an item's price, with config (#3315) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-10-05 09:14:42 -03:00
Pawkkie
7ebaddc290
Adjust evo strings for HGSS dex (#3375) 2023-10-05 08:58:28 -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
Eduardo Quezada D'Ottone
966f89eeb6
pret merge 2023-10-02 (#3372) 2023-10-02 17:37:03 -03:00
Eduardo Quezada D'Ottone
20e3b43f7c
HGSS Style Pokedex (#3288) 2023-10-02 17:28:37 -03:00
Eduardo Quezada
a6940c9e03 Merge branch 'pret_master' into RHH/pr/upcoming/pret_Merge20231002 
# Conflicts:
#	src/battle_ai_script_commands.c
#	src/battle_controller_player.c
#	src/battle_controller_recorded_opponent.c
#	src/battle_controller_safari.c
#	src/battle_controller_wally.c
#	src/battle_controllers.c
#	src/battle_gfx_sfx_util.c
#	src/battle_interface.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/mystery_gift_menu.c
#	src/pokemon.c
 2023-10-02 17:17:41 -03: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