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
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
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
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
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
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
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
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
baca050724
Allow Sliggoo to evolve during overworld fog ( #3343 )
2023-09-26 17:05:44 -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
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
7d9555dadb
change some more variables to u32
2023-09-24 11:06:45 +02: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
DizzyEggg
662dd7d2c6
Fix give daycare egg option giving buggy eggs ( #3335 )
2023-09-22 12:20:00 -03:00
Bassoonian
b673738ba5
Add config for pressing B in the PC
2023-09-21 16:26:00 +02:00
kittenchilly
d4217739e6
Add type boosting held item power config ( #3326 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-09-20 22:03:00 -03:00
Eduardo Quezada
927e4b6071
Renamed time amounts
2023-09-20 19:04:50 -03:00
DizzyEggg
136ea395ac
Fix tests breaking on modern ( #3319 )
...
* Fix tests breaking on modern
* modern tests fix - macro and rodata changes
* ld script rodata modern
2023-09-19 12:15:03 +02:00
Eduardo Quezada
fb6f45b2c3
Slight RTC documentation + Evolution times constants
2023-09-17 13:45:06 -03:00
Aaghat
75bf32e0d1
Applied requested changes
2023-09-17 17:07:58 +05:30
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
Eduardo Quezada
f3217c18dc
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# src/battle_util.c
2023-09-14 09:12:12 -03:00
DizzyEggg
7936910f90
Bug Bite - Tests and small fix ( #3282 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-09-14 08:57:30 -03:00
Alex
db039ee4e2
Tera Shards Icons ( #3307 )
2023-09-14 07:38:45 -03:00
DizzyEggg
25459073e5
ai lag fixes ready
2023-09-14 11:44:44 +02:00
DizzyEggg
bb9501449c
final ai optimizations
2023-09-14 11:05:00 +02:00