atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
14082 commits 2 branches 40 tags 617 MiB
Commit graph

14082 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
644ed8e5b3
Fixed ld_script.ld artifact from a previous pret version (#3731) 2023-12-15 00:04:40 +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
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
Martin Griffin
0daf3484c4
Fix form change table pointer defines (#3692) 2023-12-11 13:18:40 +00: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
Eduardo Quezada
b2917fac5d Merge remote-tracking branch '_RHH_origin/master' into RHH/upcoming 
# Conflicts:
#	include/constants/battle_script_commands.h
#	src/battle_script_commands.c
 2023-12-10 14:29:42 -03:00
Martin Griffin
b5ca3d0f76
Fix Ice Heal typo in test (#3676) 2023-12-10 17:17:42 +00:00
Rose
8dbce50783 Fix Ice Heal typo in test 
Ice heal heals being frozen, not paralyzed
 2023-12-10 17:07:28 +00:00
Eduardo Quezada D'Ottone
237c156964
pret merge 2023-12-10 (#3675) 2023-12-10 14:06:58 -03:00
Eduardo Quezada
ce7fe75ac1 Merge branch 'RHH/upcoming' into RHH/pr/upcoming/pret_20231210 
# Conflicts:
#	src/data/pokemon/species_info.h
 2023-12-10 13:49:55 -03:00
Eduardo Quezada
1fc712f153 Merge remote-tracking branch '_pret/master' into RHH/pr/upcoming/pret_20231210 
# Conflicts:
#	Makefile
#	data/battle_scripts_1.s
#	gflib/malloc.c
#	gflib/malloc.h
#	include/battle.h
#	ld_script.ld
#	ld_script_modern.ld
#	src/battle_ai_script_commands.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
 2023-12-10 13:27:09 -03:00
Alex
628eb95925
Adds Rage Fist (#3573) 
* Adds Rage Fist

* Fix initial implementation

* fix merge

* review changes

* endure test

* add field enduredDamage

* rage fist: transform, disguise  and field change

* merge fix
 2023-12-10 12:33:25 +01:00
Alex
403843cecf
Fixes Fling damage calcs (#3670) 2023-12-10 00:27:05 +01:00
Alex
d5f3df6f08
Fix Defog and Prevent Escape effects (#3668) 
* Fix Defog and Prevent Escape effects

* pain split / mirror coat interaction

* remove unused various define

* use pain split effect

* remove test
 2023-12-10 00:26:03 +01:00
Alex
57ce85207e
Fixes Substitute triggering Stamina and Eject Button on crash damage (#3669) 
* Fixes Substitute triggering Stamina

* Fix Eject Button triggering on crash damage
 2023-12-09 17:40:04 +01:00
Alex
d86a2136a7
Fixes Cutton Down / Defiant interaction (#3657) 2023-12-08 17:29:29 +01:00
Eduardo Quezada D'Ottone
77ae9e3485
Corrected evYield spacing (#3656) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-08 17:06:41 +01:00