Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,189 Commits 1 Branch 0 Tags
Commit Graph

10064 Commits

Author SHA1 Message Date
DizzyEggg
cd0b4db09b
same lists for healing moves (#3787) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2023-12-21 14:07:54 +01:00
DizzyEggg
3b7782ed49
Clear BattleScripting struct at the battle start (#3776) 2023-12-20 10:48:52 +00:00
Alex
069769710b
Fixes Item Metronome damage (#3767) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-20 11:24:12 +01:00
DizzyEggg
e8e9d37640
Prankster tests + fixes (#3766) 
* Prankster tests + partial fix

* Fix Prankster tests and some edge cases

---------

Co-authored-by: Alex <alexthenotes@gmail.com>
 2023-12-19 11:17:31 +01:00
DizzyEggg
1ec0333432
Fix Ion Deluge interaction with VoltAbsorb/LightRod (#3764) 
* Fix Ion Deluge interaction with VoltAbsorb/LightRod

* Use move target all battlers for ion deluge fix

* fix teatime failing

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2023-12-18 16:57:56 +01:00
DizzyEggg
59a159c338
Fix Ice Face ignoring move effects (#3755) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2023-12-18 16:02:07 +01:00
DizzyEggg
64f8635496
fix telekinesis not working (#3763) 
* fix telekinesis not working

* typo

* remove one roost known failing

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2023-12-18 15:50:03 +01:00
DizzyEggg
e1d4bcc04e
fix frisk msg + tests (#3762) 2023-12-18 15:13:14 +01:00
Eduardo Quezada
c505abd53d Merge branch 'RHH/master' into RHH/upcoming 2023-12-17 18:13:26 -03:00
DizzyEggg
e22ac51617
Fix Innards Out doing dmg after Gastro Acid / vs Magic Guard (#3758) 
* gastro acid stays for fainted mons

* Innards Out does not damage Magic Guard Pokemon
 2023-12-17 21:47:12 +01:00
Eduardo Quezada
d92c046a80 Merge branch 'RHH/master' into RHH/upcoming 2023-12-17 17:31:10 -03:00
ghoulslash
c5ef339b25
add TryShinyAnimation to Controller_PlayerPartnerShowIntroHealthbox (#3757) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-12-17 21:10:03 +01:00
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
Eduardo Quezada D'Ottone
0f7fbc628d
Fixed miscelaneous mon data (#3749) 2023-12-17 09:35:55 -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
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
fbbee39886 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	src/battle_main.c
 2023-12-15 18:50:20 -03: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
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
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
benicioneto
15c8106a9e
Fix "appearedInBattle" for single battles (#3728) 2023-12-14 15:33:43 +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
Zimmermann Gyula
0239e470cb Prevent unused variable error with Gen3 Shedinja config. 2023-12-13 18:41:10 +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
95bdc9a135 Merge branch 'RHH/master' into RHH/upcoming 2023-12-11 17:42:11 -03:00
Frank DeBlasio
a0fc6be3dd
Removed redundant ifdef and fixed Veluza stat spacing (#3698) 2023-12-11 17:01:32 -03:00
Alex
03e2571214
wrong move power (#3697) 2023-12-11 19:42:54 +01:00
Alex
22280b4778
Fixes z-move priority (#3690) 
* Fixes z-move priority

* consider prankster affected z moves

* consider only damaging moves
 2023-12-11 19:20:14 +01:00
LOuroboros
ed3e944870
Added a GetSpeciesPreEvolution function and fixed EVO_NONE value (#3696) 2023-12-11 13:54:34 -03:00
Bassoonian
1c6d551eeb Fix form change table pointer defines 2023-12-11 14:03:52 +01:00
Martin Griffin
ee1fb1d454
SpeciesInfo tests (#3688) 
* Remove unnecessary const

* Test that species ID tables are shared between all forms

* Use P_FAMILY_MELTAN

* Test that form change tables contain only IDs in form species tables

* Fix isPrimalReversion typo

* Test form change targets have appropriate species flags

* Fix #3689
 2023-12-11 13:54:20 +01:00
Bassoonian
ec9cc9a443
Config for trying to catch a Trainer's Pokémon (#3684) 
* Config for trying to catch a Trainer's Pokémon

* Prevent removal instead of adding it back
 2023-12-11 00:05:39 +01:00