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

14176 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eduardo Quezada
2fac60055f Merge branch 'RHH/master' into RHH/upcoming 2023-10-09 22:08:32 -03:00
Eduardo Quezada
0a84072ad2 Fixed 2 protection tests 2023-10-09 20:17:30 -03:00
Alex
36174f12ae
Fixes Salt Cure visual bug if mon fainted by direct attack (#3388) 
* Fixes Salt Cure visual bug if mon fainted by direct attack

* Removes duplicate give all tm/hms in the debug menu

* test

* Revert "Removes duplicate give all tm/hms in the debug menu"

This reverts commit 4e80451d6f.
 2023-10-09 23:40:38 +02: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
f7098414d3
Fixed Bergmite/Avalugg updated egg groups (#3380) 2023-10-09 12:19:18 +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
LOuroboros
70ed93e01b
Updated Hisuian form abilities to SV's standard (#3391) 2023-10-08 15:54:33 -03:00
Eduardo Quezada
a34e0f6f6f Debug menu cleanup 2023-10-07 23:04:36 -03:00
GriffinR
104e81b359
Merge pull request #1915 from GriffinRichards/misc-tasks 
Add some task/sprite data defines
 2023-10-07 21:34:52 -04: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
GriffinR
f01a6afc98
Merge branch 'master' into misc-tasks 2023-10-07 17:25:20 -04:00
marlux895
0e84c7deb3
corrected comment, tough to smart 2023-10-07 17:23:52 -04:00
Alex
28506b4cf8
Use move flags instead of lists for AI calcs (#3389) 2023-10-07 18:31:25 +01:00
Thomas Winwood
054d0f9852
Remove fakematch in NewGameInitPCItems 2023-10-07 12:52:57 -04:00
GriffinR
6f71fbe521 Add some missing trainer hill constant usage 2023-10-06 15:17:55 -04:00
Bassoonian
cee84f0f74 Fix issues and add more ability tests 2023-10-06 15:13:26 +02:00
Eduardo Quezada D'Ottone
410dc1d6c0
Implement Repeated Medicine feature (#3005) 2023-10-05 23:01:10 -03:00
Eduardo Quezada D'Ottone
07a4576ff3
Apply suggestions from code review 2023-10-05 22:35:44 -03:00
Bassoonian
9735c5d68e Defeatist, Gale Wings, Poison Heal, Sap Sipper tests 2023-10-05 23:12:30 +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
GriffinR
dec4b580a3
Merge pull request #1930 from KABoissonneault/fix/factory_oob 
Fixed out-of-bounds access in GetFactoryMonFixedIV for BUGFIX
 2023-10-05 11:51:17 -04:00
kaboissonneault
0a183c2027 Changed sFixedIVTable access from hardcoded index limits to ARRAY_COUNT 2023-10-05 08:26:34 -04: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
Eduardo Quezada
57c6fba4a1 Issue templates 1.6.1 2023-10-05 09:08:29 -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
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
kaboissonneault
3a8a82d385 Fixed out-of-bounds access in GetFactoryMonFixedIV when generating player rentals in round 8 (if player has 15+ swaps) and in round 9 2023-10-04 09:18:02 -04:00
Eduardo Quezada
098bc118b8 Indexes for Type Effectiveness table 2023-10-03 13:31:29 -03:00
Eduardo Quezada
ef1073ddee Merge branch 'RHH/master' into RHH/upcoming 2023-10-02 18:50:15 -03:00
DizzyEggg
a9528e7ade
Fix CreateNPCTrainerPartyForTrainer test failing on modern (#3367) 2023-10-02 18:33:47 -03: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
4febd2cf55 Incorporated upstream fixes 2023-10-02 17:20:17 -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
ghoulslash
3c32011d6a
Fix Intimidate Contrary in double battles (#3365) 2023-10-02 10:02:25 -04: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
dc119b27c2 Fix Intimidate Contrary in double battles 2023-10-01 19:06:43 +02:00
GriffinR
654b6380b1
Merge pull request #1926 from AsparagusEduardo/pret/pr2/EggWall 
Solved a bunch of -Wall errors on modern
 2023-10-01 11:57:30 -04:00
GriffinR
3ff27bdae0
Merge pull request #1928 from kittenchilly/friendship 
Add friendship evo threshold constant
 2023-10-01 11:53:03 -04:00
DizzyEggg
f840f7eb56
Fix Red Card not getting consumed after Sticky Web activation (#3364) 2023-10-01 10:35:12 -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
093c653801
Fixed Berserk gene issue in double battles (#3363) 
* fix berserk gene issue + tests

* Update test/battle/hold_effect/berserk_gene.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/battle/hold_effect/berserk_gene.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* berserk gene review changes

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-10-01 10:25:04 -03:00
Bassoonian
8a1f166f5d
Updates Pokémon abilities to Gen9 (#3353) 2023-09-30 20:35:35 -03:00