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
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 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
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
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 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
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 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
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
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
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
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
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
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
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
ghoulslash
0b9f12efe4
Adds support for placing Pokémon in the PC with the B button ( #3329 )
...
Adds support for placing Pokémon in the PC with the B button
2023-09-24 21:35:16 -04:00