Jaizu
|
717ba22ea1
|
Make contest opponents an enum
I'm sure that at least 2 people eventually might consider editing them, this makes it easier.
|
2023-02-03 15:49:22 +01:00 |
|
Philipp AUER
|
8983739267
|
Merge pull request #2564 from mrgriffin/rhh-battle-tests
Battle Tests
|
2023-02-01 22:18:17 +01:00 |
|
GriffinR
|
62aed217fe
|
Remove unused common symbols in window.c
|
2023-02-01 16:14:32 -05:00 |
|
GriffinR
|
28ada9c93b
|
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest-bar
|
2023-02-01 15:52:19 -05:00 |
|
GriffinR
|
020266463c
|
Add fix for described UB
|
2023-02-01 15:44:48 -05:00 |
|
GriffinR
|
07e00b2e41
|
Additional window id constant usage
|
2023-02-01 15:24:15 -05:00 |
|
GriffinR
|
4328ed8b19
|
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-windows
|
2023-02-01 14:59:45 -05:00 |
|
GriffinR
|
30f893f255
|
Fix comment mistake
|
2023-02-01 11:52:32 -05:00 |
|
GriffinR
|
9003966fcc
|
Misc field_specials cleanup
|
2023-02-01 11:48:55 -05:00 |
|
GriffinR
|
43af7d46ca
|
Label data for elevator effects
|
2023-02-01 10:43:10 -05:00 |
|
GriffinR
|
27a5e05f75
|
Label data for screen effect tasks
|
2023-02-01 10:20:23 -05:00 |
|
GriffinR
|
603d870ea0
|
Fix debug printing negative values
|
2023-02-01 09:36:18 -05:00 |
|
GriffinR
|
65d476d575
|
Remove some incorrect color constant usage
|
2023-02-01 09:32:41 -05: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 |
|
ghoulslash
|
3f616215ea
|
add silk trap anim
|
2023-01-28 09:03:18 -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 |
|
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 |
|