Eduardo Quezada
|
101ea6522d
|
Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange
# Conflicts:
# src/battle_util.c
|
2023-02-02 17:56:13 -03:00 |
|
Philipp AUER
|
8983739267
|
Merge pull request #2564 from mrgriffin/rhh-battle-tests
Battle Tests
|
2023-02-01 22:18:17 +01:00 |
|
Martin Griffin
|
f1b9872bf0
|
Test moves, items, and abilities in battle
Thank you to SBird for providing mgba-rom-test binaries and Spikes/Toxic
Spikes tests!
Co-authored-by: sbird <sbird@no.tld>
|
2023-02-01 13:53:57 +00:00 |
|
Martin Griffin
|
c11774acb8
|
Decap gStatNamesTable, Spikes, Sturdy, and Torment
|
2023-02-01 13:53:57 +00:00 |
|
Eduardo Quezada D'Ottone
|
e3bb8ab433
|
Merge pull request #2618 from Jaizu/fix_transform
Fix Transform's interaction with Gender Differences
|
2023-01-31 09:15:01 -03:00 |
|
Eduardo Quezada D'Ottone
|
fcccffce45
|
Apply suggestions from code review
* Jaizu ran away *
|
2023-01-31 09:07:45 -03:00 |
|
Jaizu
|
074e601c1f
|
Fix transform on players side too
|
2023-01-31 13:02:24 +01:00 |
|
Jaizu
|
4eb7b7048e
|
Make transform not break
|
2023-01-31 12:41:07 +01:00 |
|
Eduardo Quezada D'Ottone
|
a56cc4b6c6
|
Merge pull request #2616 from Jaizu/patch-3
Implement Destiny Knot
|
2023-01-31 07:43:03 -03:00 |
|
Jaizu
|
767008427f
|
Don't pass down daycare like AlterEggSpeciesWithIncenseItem
|
2023-01-31 09:47:02 +01:00 |
|
Jaizu
|
424f457ec2
|
Remove unused INHERITED_IV_COUNT define
|
2023-01-31 09:44:47 +01:00 |
|
Jaizu
|
68ee9e5739
|
Restore bugfix
Ooopsie!
|
2023-01-30 13:57:59 +01:00 |
|
Jaizu
|
267cf1e6f0
|
Update comment
|
2023-01-29 19:45:43 +01:00 |
|
Jaizu
|
8b1f4ac3ac
|
Implement Destiny Knot
|
2023-01-29 19:35:46 +01:00 |
|
Eduardo Quezada D'Ottone
|
d7b761f99a
|
Merge pull request #2613 from Jaizu/patch-2
Fix ball resetting when hatching an Egg
|
2023-01-28 17:53:20 -03:00 |
|
Jaizu
|
761878f1fe
|
Fix ball resetting when hatching an Egg
|
2023-01-28 21:35:04 +01:00 |
|
Eduardo Quezada D'Ottone
|
6ea0af2fb6
|
Merge pull request #2612 from ghoulslash/be/toxicdebrisfix
Fix toxic debris side status check
|
2023-01-28 16:04:20 -03:00 |
|
ghoulslash
|
feb4bfee42
|
fix toxic debris side status check
|
2023-01-28 13:56:09 -05:00 |
|
Martin Griffin
|
bdb04da9a5
|
Refactor battle animations
|
2023-01-28 00:16:25 +00: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
|
f1d97bfad7
|
Merge pull request #2607 from mrgriffin/rhh-battlescript-fixes
Fix uses of gBattlescriptCurrInstr
|
2023-01-27 19:25:06 -03: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
|
4e19d1aaec
|
Fix uses of gBattlescriptCurrInstr
- VARIOUS_SWAP_STATS and moveend could branch inside their own arguments.
- VARIOUS_JUMP_IF_LAST_USED_ITEM_BERRY was implemented in reverse.
|
2023-01-27 21:27:57 +00:00 |
|
ghoulslash
|
2b58593e33
|
Merge pull request #2595 from AsparagusEduardo/RHH/pr/data/Gen9Items
Added some Gen9 item data and fixed Punching Glove's effect
|
2023-01-27 16:13:50 -05:00 |
|
Martin Griffin
|
4ad4d8e25c
|
Encore fails if target has not moved
|
2023-01-27 18:55:50 +00:00 |
|
Eduardo Quezada D'Ottone
|
4c4fa6a2b6
|
Merge pull request #2603 from TeamAquasHideout/upcoming
Fix Wood Hammer To Have 1/3rd Recoil
|
2023-01-27 10:47:32 -03:00 |
|
Team Aqua's Hideout
|
e87e8d0898
|
Fix Wood Hammer To Have 1/3rd Recoil
Wood Hammer was set to 1/4th recoil before
|
2023-01-27 08:16:37 -05: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 D'Ottone
|
ca5a45d34d
|
Merge pull request #2601 from ghoulslash/be/flameburst
Fix flame burst hitting semi-invulnerable partner
|
2023-01-26 15:14:07 -03:00 |
|
ghoulslash
|
92341e6d6a
|
fix flame burst hitting semi-invulnerable partner
|
2023-01-26 13:04:01 -05:00 |
|
ghoulslash
|
6b86a031f0
|
Merge pull request #2598 from Jaizu/patch-1
Allow exiting the Battle Debug menu pressing B
|
2023-01-26 10:48:58 -05:00 |
|
Jaizu
|
d074daedbe
|
Allow exiting the Battle Debug menu pressing B
|
2023-01-26 16:36:33 +01:00 |
|
Eduardo Quezada D'Ottone
|
0dc6b10909
|
Merge pull request #2597 from AsparagusEduardo/RHH/pr/sync/pret_20230125
I like shorts, they're comfy and easy to wear! (pret merge 2023/01/25)
|
2023-01-25 20:37:42 -03:00 |
|
Eduardo Quezada
|
7774c9727d
|
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230125
# Conflicts:
# tools/mapjson/mapjson.cpp
|
2023-01-25 20:28:55 -03:00 |
|
Eduardo Quezada
|
3288309c43
|
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange
# Conflicts:
# src/battle_script_commands.c
|
2023-01-25 19:57:19 -03:00 |
|
walkingeyerobot
|
f9bb0bfb29
|
better handle throwing balls in a double wild battle (#2587)
* Handle throwing balls in a double wild battle where the player has only a single Pokémon.
|
2023-01-25 20:15:58 +00:00 |
|
GriffinR
|
f4cb6d229f
|
Add some missing sizeof usage for SpriteSheets
|
2023-01-24 17:04:48 -05:00 |
|
Eduardo Quezada
|
a044774896
|
Added Gen9 item data and fixed Punching Glove's effect
|
2023-01-24 16:47:54 -03:00 |
|
GriffinR
|
10230799d3
|
Simplify some max value macros
|
2023-01-23 16:01:46 -05:00 |
|
Eduardo Quezada D'Ottone
|
1202f0366c
|
Merge pull request #2586 from Jaizu/ability_popup_fixes
Ability popup updates
|
2023-01-23 17:34:18 -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 |
|
Eduardo Quezada D'Ottone
|
fbcad9d3ec
|
Merge pull request #2572 from rh-hideout/AsparagusEduardo-patch-1
Fixed Exp Candy S using the XS description
|
2023-01-23 15:00:25 -03:00 |
|
Eduardo Quezada D'Ottone
|
1bfc922c72
|
Merge pull request #2471 from ghoulslash/be/gen9items
Start Gen9 Hold Effects
|
2023-01-23 14:58:08 -03:00 |
|
ghoulslash
|
8cc923ebcc
|
parentheses around random & 1
|
2023-01-23 09:42:04 -05:00 |
|
Eduardo Quezada D'Ottone
|
2b22bdf1e7
|
Merge pull request #2579 from LOuroboros/allahu
Fixed Explosion & Intimidate's 'interaction'
|
2023-01-23 11:37:06 -03: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 |
|