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

14199 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bassoonian
9e051aa058 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmergenewyears 2023-12-30 20:49:05 +01:00
Alex
cc32e378d6
Adds some Indigo Disk moves (#3853) 
* Burning Bulwark

* Fickle Beam

* Alluring Voice

* Electro Shot

* forgot sheer force flag for alluring voice

* review changes

* additional alluring voice test

* Simple Allruing Voice animation

* Update battle.h

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-30 20:20:12 +01:00
kittenchilly
66a638f7b4
Change Ivy Cudgel to be based on Ogerpon form rather than held item (#3865) 
* Change Ivy Cudgel to be based on Ogerpon form rather than held item

* Update ivy_cudgel.c

* Address reviews

* Update test/battle/move_effect/ivy_cudgel.c

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-30 11:40:58 +01:00
Martin Griffin
ed850d3f6c
VSync BENCHMARKs and avoid AdvanceRandom in tests (#3866) 2023-12-30 11:10:40 +01:00
Martin Griffin
ab900e38df Merge remote-tracking branch 'rhh/master' into upcoming 2023-12-29 19:48:21 +00:00
Bassoonian
245026353d
Remove leftover TID placeholder move defines (#3864) 2023-12-29 18:59:14 +00:00
kittenchilly
ecba468a96
Fix item effect for SV evolution items (#3858) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-29 15:03:42 +01:00
Bassoonian
6bc0bf9f8b
Ability refactor (#3861) 
* Ability refactor

* Adds abilities to RHH rom header

---------

Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
 2023-12-29 14:25:24 +01:00
Ninjdai
16a3954f0e
Add MOVES_COUNT and NUM_SPECIES to RHH rom header (#3831) 
* Add MOVES_COUNT and NUM_SPECIES to RHH rom header
 2023-12-29 13:12:17 +00:00
DizzyEggg
604b823ffd
Missing Strength sap tests (#3860) 
* add missing strength sap tests

* a

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-29 13:39:54 +01:00
Bassoonian
bc4d4d21e4
Fix 3851 (#3857) 2023-12-29 00:33:18 +01:00
Eduardo Quezada D'Ottone
0a40cd15d1
Non-tagged release 2023-12-28 19:54:06 -03:00
Bassoonian
d3f971f0e8
Version 1.7.1 (#3855) 2023-12-28 19:50:21 -03:00
kittenchilly
94a650a203
Add Fillet Away + Belly Drum tweaks (#3616) 
* Add Fillet Away

* Fillet Away and Belly Drum tests

* More tests

* Update fillet_away.c

* Update fillet_away.c

* Newlines

* Update battle_scripts_1.s

* Update belly_drum.c

* Address reviews

* Fix order

* Swords Dance assume

* Update belly_drum.c

* Try some stuff

* Fix hp not being halved in certain cases

* Update battle_scripts_1.s

* AI stuff
 2023-12-28 23:27:09 +01:00
kittenchilly
1e958ada8c
Add Indigo Disk item data (#3854) 2023-12-28 23:00:34 +01:00
Bassoonian
fde3fc0a52
Metronome move fix (#3852) 
* Draft Indigo Disk move data

* Add basic defines (flags, targets and priority missing)

* Update move flags

* Temper Flare is Stomping Tantrum

* Fix failing tests

* Disable Burning Bulwark for now
 2023-12-28 16:57:29 +01:00
Bassoonian
bc3737772a
Define new abilities (#3838) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2023-12-28 12:33:29 +01:00
Bassoonian
872ddf32c6
The Indigo Disk Moves (#3704) 
* Draft Indigo Disk move data

* Add basic defines (flags, targets and priority missing)

* Update move flags

* Temper Flare is Stomping Tantrum

* Forgot to push, please squash :D

* Fix failing tests
 2023-12-28 12:21:52 +01:00
kittenchilly
28f17772ec
Implement Pokemon Box Link functionality (#3837) 
* Implement Pokemon Box Link functionality

* Update item_use.c

* Update item_use.c

* Can only use box link if the map allows escape

* Revert "Can only use box link if the map allows escape"

This reverts commit be5b46b6c4.

* Overworld_IsEscapingAllowed

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2023-12-28 11:47:00 +01:00
tertu
c57b1548a0
Replace at least some shuffle algorithms with Shuffle (#3801) 
Most of these are the poor-quality and slow "naive shuffle", but some might be better.
In any case, Shuffle is known good.
 2023-12-28 09:58:35 +00:00
kittenchilly
4f61d44dfe
Add Treasure Factor to Nugget and Tiny Mushroom (#3836) 2023-12-28 00:02:51 +01:00
GriffinR
6c96641035
Merge pull request #1969 from Kurausukun/macros 
Safeguard SQUARE and CUBE Macro Arguments in Parentheses
 2023-12-27 17:39:37 -05:00
Kurausukun
7567b0a57a safeguard SQUARE and CUBE macro arguments in parentheses 2023-12-27 17:29:35 -05:00
Bassoonian
88b0bd6394
Add gen9 item prices + configs (#3834) 
* Add gen9 item prices + configs

* Adjust gen 1 PP item costs

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2023-12-27 22:48:56 +01:00
DizzyEggg
3e321d1172
fix ally switch dig issue (#3835) 2023-12-27 15:35:42 -05:00
Frank DeBlasio
f5e0b3df23
Changed SHINY_ODDS to FALSE in pokedex_plus_hgss.c (#3832) 2023-12-27 20:28:44 +01:00
Martin Griffin
3ad66028e9
Backwards-compatible BoxPokémon Refactor (#3438) 
* Check progress in non-battle PARAMETRIZEd tests

* Overworld Script Tests

* Backward-compatible BoxPokemon Refactor

Reuses space that contains zeros to provide space for:
- HP/status in the box
- 12-character nicknames
- Up to 63 PokéBalls
- Shininess separate from PID
- Hidden Nature
- Hyper Training
- Dynamax Level
- Gigantamax Factor
- Terastallization Types
- Shadow

Implements:
- OW_PC_HEAL to switch between Gen7- and Gen8+ behavior
- Nature Mints
- Dynamax Candy
- Hyper Training commands (canhypertrain/hypertrain)
- Gigantamax Factor commands (hasgigantamaxfactor/togglegigantamaxfactor)
- Terastallization Type on the summary screen
- Prevents Gigantamax Factor Pokémon from evolving into a species without a Gigantamax form

* fixup! Backward-compatible BoxPokemon Refactor

* displaydexinfo fix from Jasper
 2023-12-27 17:48:17 +01:00
ghoulslash
a9d6832908
Separate AI flags by battler position (#3003) 
* ai flags by battlerId

* fix recoded battle saved ai flags

* update aiFlags check in OpponentHandleChoosePokemon

* add header for TRAINER_CUSTOM_PARTNER define

* initialize flags in BattleAI_SetupAIData

* fix usage of TRAINER_CUSTOM_PARTNER

* remove whitespace

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-12-27 13:54:37 +01:00
Bassoonian
41ff985bb6
PCG fix (#3830) 2023-12-27 12:15:16 +01:00
Gabriel Cowley
3bae98f768
Fix P_FAMILY if blocks for Regigigas and Giratina (#3823) 2023-12-26 10:16:16 +01:00
Alex
45da55eb14
Fixes Minior form change and likely other forms (#3822) 
* Fixes Minior form change and likely other forms

* new fix

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-25 20:18:52 +01:00
Alex
166a1a4e63
Adds ability Embody Aspect + minor fix to Hospitality (#3821) 
* Adds ability Embody Aspect + minor fix to Hospitality

* comment out failing tests related to neutralizing gas

* fixes neutralizing gas bug

* leftover
 2023-12-25 18:28:16 +01:00
Alex
1339256d5d
Adds Ability Hospitality (#3818) 
* Adds Ability Hospitality

* fix agbcc
 2023-12-25 01:43:57 +01:00
Bassoonian
c47a20a446
Fix gem boost description + test (#3817) 2023-12-25 01:14:01 +01:00
ghoulslash
5cc54f5c96
fix cotton down overwriting gBattlerAttacker (#3783) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-24 23:19:59 +01:00
LOuroboros
58b03cb3bd
Implemented a CannotUseItemsInBattle function (#3524) 
* Implemented a CannotUseItemsInBattle function
This fucntion is the result of merging CannotUseBagBattleItem and CannotUsePartyBattleItem. No reason to split the work between 2 functions when you can do it all with just 1.

Misc. Changes:
-Turned most of the if statements inside the function into "else if" statements for performance reasons.
-Refactored how the local variable "cannotUse" was used turning it into a bool.

* Made CannotUseItemsInBattle use a switch statement

Misc. Changes:
-Removed pointless parentheses from case EFFECT_ITEM_SET_FOCUS_ENERGY
-Removed pointless i loop variable from case EFFECT_ITEM_INCREASE_ALL_STATS and replaced a hardcoded 1 in its for loop.
-Turned the i loop variable declared at the top of the function into a u32 variable
-Removed pointless comments. The EFFECT_ITEM constants are readable enough to convey what sort of items they affect.

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2023-12-24 22:10:01 +01:00
kittenchilly
37f19ed39e
Fix Maushold-3 and Maushold-4 icons being swapped (#3809) 2023-12-23 17:34:52 +01:00
Zimmermann Gyula
f700466e8d
Implement optional Gen1 type immunity logic. (#3627) 
* Implement optional Gen1 type immunity logic.

* Add tests against Gen1 burn, freeze and paralysis.

* !fixup Expand tests with Gen1 paths.

* Fixup tests.

Remove superflous defines.
Explicitly ASSUME used move type and effect.

* Fix flipped definitions on Freezing Glare test.

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-23 16:34:24 +01:00
Zimmermann Gyula
d2235a3657
Depreciate agbcc and clarify gcc version usage in install instructions. (#3788) 
* Depreciate agbcc in install instructions.

* Clarify that Ubuntu 22.04 ships with GCC v10.

* Also clarify v13 usage on remote repos.

* Typo.

* Use Edu's reworded note from the Team Aqua discord.

https://discord.com/channels/976252009114140682/1023424424713650196/1187462445762101278
 2023-12-23 12:43:46 +01:00
Alex
61e6365470
Fixes Photon Geyeser category + minor AI calc fixes (#3807) 2023-12-23 12:31:40 +01:00
Zimmermann Gyula
72615a7c35
Prevent infinite loop. (#3808) 
Regression caused by fe1bad68b4
 2023-12-23 12:29:12 +01:00
DizzyEggg
1a7166c2bb
Tests do not allow to use SEND_OUT if the chosen mon is fainted (#3752) 
* Tests dont allow to send out pokemon with 0 hp

* remove test test

* handle in-game 0 hp sent out

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-23 00:27:40 +01:00
Alex
fd45b383b1
Fix Photon Geyser (#3803) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-22 23:38:57 +01:00
Philipp AUER
5651bea82b
[battle_controller_player.c] refactor and fix buffer overread (#3792) 
Co-authored-by: sbird <sbird@no.tld>
 2023-12-22 23:24:12 +01:00
tertu
fb28ce50ae
Optional high-quality RNG (#3780) 
High-quality RNG, behind the HQ_RANDOM flag, enabled by default

Makes the shuffle test error a bit more tolerant
 2023-12-22 17:39:15 +00:00
Alex
63316daf30
Adds missing Doodle tests and fix (#3800) 2023-12-22 18:25:23 +01:00
kittenchilly
505b8b63eb
Add Doodle + update ability banlists (#3609) 
* Add Doodle

* Doodle test

* Oops

* Update battle_util.c

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-22 16:45:55 +01:00
ghoulslash
38d67d9051
fix exp gain when defeating two opponents at once (#3798) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-12-22 16:24:46 +01:00
Alex
83e2f4bdf8
Adds ability Minds Eye + Tests (#3782) 
* Implemented Mind's Eye with tests + Keen Eye tests

* AI test

* fix AI minds eye test

* Adds ability Minds Eye + Tests

* fix tests

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-22 16:22:53 +01:00
Alex
566653aa63
Replace mons for gen9 abilities (#3740) 2023-12-22 15:05:35 +01:00