Eduardo Quezada
|
32b2c01619
|
Merge branch 'RHH/upcoming' into RHH/pr/fix/GassyTerrain
# Conflicts:
# test/test.h
|
2023-03-26 16:06:04 -03:00 |
|
Philipp AUER
|
4928911cd0
|
Speed up PASSES_RANDOMLY via structured RNG (#2720)
|
2023-03-24 15:16:29 +01:00 |
|
Eduardo Quezada
|
c383c995f1
|
Applied review changes
|
2023-03-24 10:12:09 -03:00 |
|
Eduardo Quezada D'Ottone
|
1da65c4051
|
Fixed Grassy Terrain not healing
|
2023-03-23 22:33:47 -03:00 |
|
Eduardo Quezada D'Ottone
|
023cc4d38d
|
Fixed erroneous uses of non e-reader Enigma Berries (#2839)
|
2023-03-23 09:58:26 +01:00 |
|
AgustinGDLV
|
03f6fe635f
|
changed CanBeConfused to actually check its argument (#2855)
|
2023-03-23 09:50:44 +01:00 |
|
LOuroboros
|
f4e8389779
|
Added Psyblade and Hydro Steam
|
2023-03-17 09:25:39 -03:00 |
|
Martin Griffin
|
89deda0416
|
Allow tests to override specific RNG calls
|
2023-03-15 13:39:17 +00:00 |
|
LOuroboros
|
fdebc994d2
|
Updated Supreme Overlord's effect's code
|
2023-03-07 19:14:38 -03:00 |
|
Eduardo Quezada D'Ottone
|
81a80e566c
|
Refactor Mega Evolution indicator sprite (#2805)
|
2023-03-07 08:06:28 -03:00 |
|
DizzyEggg
|
a04046dbb6
|
Add tests for Defog and fix Defog battle strings (#2737)
* start working on defog tests
* defog tests + improve terrain end battlescripts
* newline
|
2023-03-06 20:35:08 +01:00 |
|
DizzyEggg
|
306c4565a0
|
merge
|
2023-03-06 15:32:28 +01:00 |
|
Eduardo Quezada
|
9917f5cc8b
|
Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303
# Conflicts:
# Makefile
# include/constants/pokemon.h
# include/pokemon.h
# make_tools.mk
# src/battle_ai_script_commands.c
# src/battle_controllers.c
# src/battle_main.c
# src/battle_script_commands.c
# src/party_menu.c
# src/pokemon.c
# src/trade.c
# src/trainer_pokemon_sprites.c
|
2023-03-03 11:00:50 -03:00 |
|
ghoulslash
|
6cf84ee53e
|
Fixes certain moves preventing Z status moves. (#2791)
|
2023-03-02 09:41:02 -05:00 |
|
GriffinR
|
ec89e519f9
|
Merge pull request #1858 from AsparagusEduardo/pret/doc/fateful
Rename eventLegal to modernFatefulEncounter
|
2023-02-28 11:48:34 -05:00 |
|
Eduardo Quezada
|
90021f3be6
|
Removed zMovePower field in gBattleMoves in favor of a function.
|
2023-02-27 23:49:43 -03:00 |
|
Alex
|
21ca6defa7
|
forgot torment
|
2023-02-27 18:39:17 +01:00 |
|
Alex
|
1a2504d5ee
|
forgot disable
|
2023-02-27 18:29:29 +01:00 |
|
Alex
|
930a88b0e2
|
z status moves did not work properly
|
2023-02-27 18:00:32 +01:00 |
|
AgustinGDLV
|
e537be76ea
|
Z-moves bypass protection (#2730)
|
2023-02-27 09:17:07 +01:00 |
|
DizzyEggg
|
919fb184fe
|
AI knows how to handle Illusion (#2726)
* AI knows how to handle Illusion
|
2023-02-27 09:12:52 +01:00 |
|
DizzyEggg
|
4bdca43dbd
|
refactor mega evolution indicator sprite
|
2023-02-26 12:51:35 +01:00 |
|
Alex
|
df47312e32
|
Fix move to battle_util.c
|
2023-02-25 12:38:57 +01:00 |
|
Eduardo Quezada
|
079ca8ab29
|
Renamed MON_DATA_SPECIES2 to MON_DATA_SPECIES_OR_EGG for clarification
|
2023-02-24 07:53:02 -03:00 |
|
DizzyEggg
|
e0b76e98ff
|
Add MOVE_SHELL_TRAP Effect (#2716)
* implemented Shell Trap
Co-authored-by: AgustinGDLV <agustingomezdelavega@gmail.com>
|
2023-02-22 13:55:34 +00:00 |
|
DizzyEggg
|
03915524c5
|
Fix switch-in abilities activating on empty field
|
2023-02-20 12:42:06 +01:00 |
|
DizzyEggg
|
380af442c3
|
Fix buggy pokemon anims with Illusion (#2639)
* try illusion fix
* fix
|
2023-02-19 12:05:56 +01:00 |
|
DizzyEggg
|
0c523f9518
|
Fix Magic bounce powder moves against grass types (#2633)
* Fix Magic bounce powder moves against grass types
|
2023-02-17 13:55:51 +00:00 |
|
DizzyEggg
|
56c9564e7a
|
8th gen Howl's effect (#2700)
* Howl gen8 effect
|
2023-02-17 10:28:46 +00:00 |
|
DizzyEggg
|
d637ee3b13
|
Fix After You for gen8 (#2646)
Fix After You
|
2023-02-16 20:59:36 +00:00 |
|
Eduardo Quezada
|
bd54990333
|
Review changes
|
2023-02-15 13:56:11 -03:00 |
|
ghoulslash
|
908b509401
|
Fix Round's Base Power calc, Add Turn order effects (#2602)
* fix round base power calc, add turn order change
* remove unused callnative cmd
* fix round turn order update
* fix moveTarget getting set incorrectly in HandleAction_UseMove. also redirection doesn't affect MOVE_TARGET_ALL_BATTLERS
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2023-02-14 16:49:50 +01:00 |
|
Eduardo Quezada
|
96865f66af
|
Updated term to modernFatefulEncounter
|
2023-02-11 22:36:42 -03:00 |
|
Eduardo Quezada
|
6da5e0a280
|
Rename eventLegal to fatefulEncounter
|
2023-02-11 17:13:53 -03:00 |
|
ghoulslash
|
7e9d40d401
|
Merge pull request #2645 from DizzyEggg/damp_aftermath
Damp shows ability pop-up when reacting with Aftermath
|
2023-02-07 10:18:23 -05:00 |
|
DizzyEggg
|
f762ed728d
|
remove pointless timers from disable struct
|
2023-02-07 15:10:20 +01:00 |
|
DizzyEggg
|
0dc5e1e685
|
aftermath damp pop-ups and string
|
2023-02-07 13:01:56 +01:00 |
|
Philipp AUER
|
8983739267
|
Merge pull request #2564 from mrgriffin/rhh-battle-tests
Battle Tests
|
2023-02-01 22:18:17 +01:00 |
|
ghoulslash
|
feb4bfee42
|
fix toxic debris side status check
|
2023-01-28 13:56:09 -05:00 |
|
Martin Griffin
|
cba4b78df6
|
Move-based mega evolution message for NPCs/recorded battles
|
2023-01-28 00:16:24 +00:00 |
|
Eduardo Quezada D'Ottone
|
53e41a2b3d
|
Merge pull request #2605 from mrgriffin/rhh-battle-tests-fixes
Rhh battle tests fixes
|
2023-01-27 19:24:13 -03:00 |
|
Martin Griffin
|
6a403ab45c
|
Pastel Veil grants immunity to poison
|
2023-01-27 00:57:24 +00:00 |
|
Martin Griffin
|
3647825a30
|
Fix Poison Point
It incorrectly activated only if the Pokémon with Poison Point could be
poisoned by the attacker.
|
2023-01-27 00:57:24 +00:00 |
|
Martin Griffin
|
a13ffdbfba
|
U-turn does not switch the user out if Emergency Exit activates
|
2023-01-27 00:57:22 +00:00 |
|
Eduardo Quezada
|
a044774896
|
Added Gen9 item data and fixed Punching Glove's effect
|
2023-01-24 16:47:54 -03:00 |
|
ghoulslash
|
321634ed3b
|
Silk Trap Effect (#2512)
* add silk trap effect, analog of obstruct
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2023-01-23 16:42:47 -03:00 |
|
ghoulslash
|
8cc923ebcc
|
parentheses around random & 1
|
2023-01-23 09:42:04 -05:00 |
|
ghoulslash
|
e93d22c0f1
|
optimize IsMoveMakingContact
|
2023-01-23 09:37:05 -05:00 |
|
ghoulslash
|
125e73dd07
|
loaded dice fix
|
2023-01-23 09:36:17 -05:00 |
|
ghoulslash
|
f97ec1975a
|
merge w upcoming
|
2023-01-23 09:24:03 -05:00 |
|