DizzyEggg
76a7513dcd
Fix Magician Life orb recoil when stealing ( #3753 )
...
* Fix Magician Life orb recoil
* get rid of unneeded assume
2023-12-17 19:50:43 +01:00
Eduardo Quezada D'Ottone
5d2efbe1a2
Fixed Raging Fury not causing rampage on user ( #3754 )
2023-12-17 19:23:09 +01:00
DizzyEggg
d79fe11bb1
get rid of known failing in ai test ( #3748 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-12-17 15:11:02 +01:00
Eduardo Quezada D'Ottone
0f7fbc628d
Fixed miscelaneous mon data ( #3749 )
2023-12-17 09:35:55 -03:00
Eduardo Quezada D'Ottone
df1a8a25cb
Reserved remaining form ID that are left to support ( #3750 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-12-17 09:22:33 -03:00
Katy
8a644e00a0
Gen 9 Species Sprite Fixes ( #3751 )
...
* Charcadet GFX Changes
* Capsakid Shiny Pal
* Rellor Back Sprite
* Wiglett GFX Changes
* Wugtrio Shiny Pal
* Finizen Shiny Pal
* Palafin Zero Shiny Pal
* Cyclizar Shiny Pal
* Orthworm GFX Changes
* Glimmet Shiny Pal
* Glimmora Shiny Pal
* Dondozo Shiny Pal
* Frigibax Back Sprite
I honestly think this thing needs a new backsprite
2023-12-17 12:55:13 +01:00
DizzyEggg
acec68fdb8
fix neutralising gas visual glitch ( #3746 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2023-12-17 00:41:50 +01:00
DizzyEggg
3df101a6a0
fix baton pass not passing embargo ( #3745 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2023-12-17 00:25:16 +01:00
Eduardo Quezada
537f1c9235
Merge branch 'RHH/master' into RHH/upcoming
2023-12-16 20:13:15 -03:00
CyanSMP64
a6622ec931
fix some sprite palettes ( #3744 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-12-16 16:25:11 +01:00
ghoulslash
050d3a546f
Fix regression introduced for Eject Button ( #3738 )
...
Fix regression introduced for Eject Button
2023-12-16 07:57:36 -05:00
ghoulslash
3209cb0dc9
Merge branch 'upcoming' into regression
2023-12-16 07:39:08 -05:00
Alex
65bfab1a38
rename Cmd_jumpifaffectedbyprotect
2023-12-16 09:48:41 +01:00
Alex
cdeb43228d
Use battler turn damaged
2023-12-16 09:33:45 +01:00
Eduardo Quezada D'Ottone
ef6edcf098
Fixed Ivy Cudgel test name ( #3742 )
2023-12-16 09:22:36 +01:00
Eduardo Quezada
fbbee39886
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# src/battle_main.c
2023-12-15 18:50:20 -03:00
Alex
e339bc4f29
Fix Fiery Wrath anim ( #3739 )
2023-12-15 20:27:04 +01:00
Alex
94ffeb2cf8
Fix Quick Claw chance ( #3737 )
2023-12-15 17:05:11 +01:00
Alex
fbd7d88e4f
Fix regression introduced for Eject Button
2023-12-15 16:54:10 +01:00
Eduardo Quezada D'Ottone
9ba31ac306
Separated gSpeciesInfo by Generation ( #3729 )
2023-12-15 12:29:00 +00:00
Martin Griffin
6cc1ebfd9c
Add status form change ( #3734 )
2023-12-15 10:34:22 +00:00
Bassoonian
0fd08a32ac
Add status form change
2023-12-15 11:17:35 +01:00
Eduardo Quezada D'Ottone
c44e133d8c
Updated Gen 9-mon-exclusive ability tests to use Gen 9 mon ( #3733 )
...
* Updated Gen 9-mon-exclusive ability tests to use Gen 9 mon
* Fixed message
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-12-15 00:19:28 +01:00
Eduardo Quezada D'Ottone
9cb1b9750e
Broader description for PR template ( #3732 )
...
* Broader description for PR template
* Update pull_request_template.md
2023-12-15 00:05:16 +01:00
Eduardo Quezada D'Ottone
644ed8e5b3
Fixed ld_script.ld artifact from a previous pret version ( #3731 )
2023-12-15 00:04:40 +01:00
Alex
be045fdc0c
Fixes Quick Draw ( #3724 )
...
* Fixes Quick Draw
* Fixes Custap and rest of Quick Draw
* review applied
2023-12-15 00:03:59 +01:00
Alex
38c61854e6
Changed Ivy Gudgel effect ( #3721 )
...
* Change Ivy Gudgel effect
* test assumptions
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-12-14 18:09:06 +01:00
Bassoonian
02ca83cc81
The Indigo Disk Item/Move/Ability ids ( #3727 )
...
* Reserve ability ids
* Reserve item ids (base64 encoding for reference)
* Reserve move ids
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2023-12-14 16:06:11 +01:00
benicioneto
15c8106a9e
Fix "appearedInBattle" for single battles ( #3728 )
2023-12-14 15:33:43 +01:00
Eduardo Quezada D'Ottone
78fda2c19d
Reserved Species IDs for Indigo Disk ( #3726 )
2023-12-14 12:53:51 +01:00
Eduardo Quezada D'Ottone
9bb95d506e
Reserved dex flag space for Indigo Disk mon ( #3725 )
2023-12-14 11:24:11 +01:00
Eduardo Quezada D'Ottone
996009e8ef
Fixed compile when setting everything to GEN_1 ( #3723 )
2023-12-14 00:24:31 +01:00
Eduardo Quezada D'Ottone
63ff8b9f70
Fixed bad use of family defines ( #3722 )
2023-12-13 22:31:13 +01:00
Alex
f88c1bf7e9
Prevent unused variable error with Gen3 Shedinja config. ( #3720 )
2023-12-13 19:02:33 +01:00
Alex
a5c8f67f0b
Merge branch 'upcoming' into shedinja-ball
2023-12-13 18:50:35 +01:00
Zimmermann Gyula
ba2bb4f07f
Use the same relative gBattleTextBuff3 declaration in both definitions. ( #3719 )
...
Compare against https://github.com/rh-hideout/pokeemerald-expansion/blob/upcoming/src/battle_main.c#L135 .
2023-12-13 18:49:25 +01:00
Zimmermann Gyula
0239e470cb
Prevent unused variable error with Gen3 Shedinja config.
2023-12-13 18:41:10 +01:00
Zimmermann Gyula
a68cf9f4dc
Fix Vs Seeker description. ( #3718 )
2023-12-13 18:05:37 +01:00
Zimmermann Gyula
bbc29fff0d
Fix a copypaste error and a typo in config. ( #3717 )
2023-12-13 17:39:26 +01:00
Eduardo Quezada D'Ottone
11b548c0cb
Gen7+ move Sky Battle flags use B_EXTRAPOLATED_MOVE_FLAGS ( #3714 )
...
* Gen7+ move Sky Battle flags use B_EXTRAPOLATED_MOVE_FLAGS
* Fixed whitespace in move data
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-12-13 10:08:58 +01:00
Eduardo Quezada D'Ottone
75764ab91d
Fixed LoadChosenBattleElement documentation ( #3713 )
2023-12-12 20:57:14 +01:00
Bassoonian
f1966904d7
Add Move Reminder to debug menu + organization ( #3707 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-12-12 15:20:12 -03:00
Alex
1f51ff8dfb
Add Gen5 Imprison config ( #3710 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-12-12 19:06:24 +01:00
Bassoonian
75b45a93fb
Missing dex texts ( #3708 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2023-12-12 18:43:50 +01:00
AtariDreams
929ec54a39
Update catch curve for pokeballs ( #3685 )
...
Since Gen 6, the capture rate curve was changed to make pokeballs more effective on lower level pokemon
It's by 65536 divided by 255 to the power of(1/5.33) and I did the work of translating that so a rough approximation can be done in integers, and so far, it seems to work close enough. I use this in my romhack for months now and it works fine.
2023-12-12 16:25:33 +01:00
Bassoonian
1ed07f792b
Fixes H Sneasel's type ( #3706 )
2023-12-12 12:18:39 +01:00
Alex
44e81d4f4c
Gen 9 configs for Protean/Libero, Intrepid Sword and Dauntless Sword ( #3614 )
...
* Gen 9 configs for Protean/Libero, Intrepid Sword and Dauntless Sword
* use bitfield
* battler fix
* fields
2023-12-12 00:08:44 +01:00
Eduardo Quezada D'Ottone
882c5529e0
Removed redundant call to GetTimeOfDay for Dusk Ball effect ( #3701 )
2023-12-11 23:17:27 +01:00
Eduardo Quezada D'Ottone
26a8c2a5a9
Fixed FORM_CHANGE_ITEM_USE_MULTICHOICE documentation ( #3700 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2023-12-11 22:23:27 +01:00
Eduardo Quezada
95bdc9a135
Merge branch 'RHH/master' into RHH/upcoming
2023-12-11 17:42:11 -03:00