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

13647 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
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
kittenchilly
cc1d748b47
Fixed Shiny Charm doing too many rerolls by default (#3327) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-09-30 20:34:52 -03:00
DizzyEggg
8efc34eb7e
flinch tests + protect/flinch fix (#3345) 2023-09-30 20:30:28 -03:00
Eduardo Quezada
b724cfc578 Review comment 2023-09-30 18:22:38 -03:00
Eduardo Quezada
70ec4c4406 Merge branch 'RHH/master' into RHH/upcoming 2023-09-30 17:44:06 -03:00
Eduardo Quezada D'Ottone
977860f834
Fixed deleting PC mon by placing another one on top with B (#3360) 2023-09-30 20:31:11 +02:00
kittenchilly
9f1dbeeead
Pickup Table Refactor (#3351) 2023-09-28 17:41:42 -03:00
Eduardo Quezada D'Ottone
7b3f72f5ff
Version 1.6.0 (#3350) 2023-09-27 13:42:30 -03:00
Eduardo Quezada D'Ottone
a0e560e0ec
Updated README.md (#3352) 
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
 2023-09-27 13:41:58 -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
9f60202667 Merge branch 'RHH/upcoming' into RHH/pr/version/1.6.0 2023-09-26 22:53:49 -03:00
kittenchilly
cc30dc06d5 Add friendship evo threshold constant 2023-09-26 16:25:15 -05:00
kittenchilly
baca050724
Allow Sliggoo to evolve during overworld fog (#3343) 2023-09-26 17:05:44 -03:00
GriffinR
3eb1fa6fcb
Merge pull request #1925 from AsparagusEduardo/pret/pr2/dayNightConst 
Slight RTC documentation + Evolution times constants
 2023-09-26 15:01:37 -04: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
f3a65c0315 Merge branch 'RHH/master' into RHH/upcoming 2023-09-26 09:12:28 -03:00
Eduardo Quezada D'Ottone
f35c5e2346
Pret merge 2023/09/26 (#3347) 2023-09-26 08:36:12 -03:00
Eduardo Quezada
2d397030fa Incorporate upstream fixes 2023-09-26 08:22:26 -03:00
Eduardo Quezada
9144b36ac1 Merge remote-tracking branch 'pret/master' into RHH/upcoming 
# Conflicts:
#	include/graphics.h
#	src/anim_mon_front_pics.c
#	src/data/graphics/pokemon.h
#	src/data/pokemon/level_up_learnsets.h
#	src/data/pokemon/pokedex_text.h
#	src/data/pokemon_graphics/still_front_pic_table.h
#	src/wild_encounter.c
 2023-09-26 08:13:49 -03:00
Eduardo Quezada D'Ottone
de577f955a
Greatly reduce AI lag (#3308) 2023-09-26 07:28:18 -03:00
DizzyEggg
e0e49a9933
Fix protect recoil issue and add tests for protect (#3321) 
* fix protect recoil issue and add tests for protect

* test for #3312 and baneful bunker fix

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* Update test/battle/move_effect/protect.c

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

* more recoil moves for protect test

* Update test/battle/move_effect/protect.c

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

* rename spiky shield test

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-09-26 07:26:23 -03:00