Commit graph

14231 commits

Author SHA1 Message Date
Frank DeBlasio
6cb89ef382
Update debug menu text (#3919)
* Updated capitalization and abbrevations in debug menu

* Updated spacing in debug.c
2024-01-03 22:49:11 +00:00
LOuroboros
d7cdf41429
Added EV setters to the debug menu's "Give Pokémon Complex" (#3566)
* Added EV setters to the debug menu's "Give Pokémon Complex"

Misc. Changes:
-Updated the text strings for the 2 "Give Pokémon" options used by the debug menu.

* Optimized DebugAction_Give_Pokemon_SelectShiny and made some debug functions use relevant constants

* Removed extra call to CalculateMonStats in DebugAction_Give_Pokemon_ComplexCreateMon

* Made the EV selection go back to the start if the sum of EV is > 510

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-01-03 21:28:55 +00:00
Bassoonian
f94e65a400
Footprint config (#3902)
* Footprint config

* Don't enable by default
2024-01-03 21:24:45 +01:00
Bassoonian
e7fac028b1
Fix summary screen nature colours after mints (#3898) 2024-01-03 17:48:09 +01:00
Alex
cb89df82b5
Dynamic Multichoices (#3826) 2024-01-03 16:07:11 +01:00
Alex
34f51da5f8
Merge branch 'upcoming' into feature/dynmulti-expansion 2024-01-03 15:54:39 +01:00
Bassoonian
9f09309e0c
Remove comment from pokemon_icon.c (#3896) 2024-01-02 23:29:46 +01:00
aronson
3c21e23555
Allocate initialized sections for EWRAM and IWRAM (#3892) 2024-01-02 14:24:52 +00:00
Nephrite
7aaefe72fb
Receiver/Power of Alchemy (#3889) 2024-01-01 19:58:29 +01:00
Nephrite
ab75ad6d02
Ability flags update (#3886)
* Added five ability flags

Omitted duplicate flags that are basically "can't copy" (Role Play, Receiver, Entrainment, Skill Swap), didn't bother adding Neutralizing Gas flag,

* Mold Breaker and Trace

* Gastro Acid, Simple Beam, Worry Seed

Decided to keep the Simple Beam/Worry Seed functions

* Entrainment done

* Skill Swap

* Doodle/Role Play + flag descriptions

Also adjusted Doodle test

* Wandering Spirit, Mummy, Neutralizing Gas

Neutralizing Gas really only needs to check for other mons with Neutralizing Gas, otherwise unsuppressable abilities are handled separately.

* Renamed flags
2024-01-01 15:03:34 +01:00
kittenchilly
f6f287d637
Add Indigo Disk Pokemon data (#3878)
* Archaludon?

* more archuladon stuff

* Hydrapple and Gouging Fire

* Raging Bolt

* Iron Boulder and Iron Crown

* Terapagos

* Pecharunt

* Update gen_9.h

* Pokedex orders
2024-01-01 01:38:50 +01:00
Bassoonian
f31b4f3bab
Turn nature names into compound strings (#3871)
* Turn nature names into compound strings

* Move nature names out of dedicated file
2023-12-31 11:33:52 +01:00
Alex
15fa85ca2f
Merge branch 'upcoming' into feature/dynmulti-expansion 2023-12-31 00:16:44 +01:00
Bassoonian
a32e2ccc88
Move Ability AI scores to gAbilities (#3862)
* Ability refactor

* Adds abilities to RHH rom header

* Move Ability Ratings to gAbilities

* Add previously unknown ai ratings

---------

Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
2023-12-30 23:07:18 +01:00
DizzyEggg
b83b1f7e88
Merge branch 'upcoming' into feature/dynmulti-expansion 2023-12-30 22:41:59 +01:00
Bassoonian
a094266731
2023's last pret merge (#3869) 2023-12-30 22:40:29 +01:00
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
sbird
7f3264c151 [dynamic multichoice] fix -Wall warnings / errors 2023-12-26 14:29:11 +01:00
sbird
c27ea10eb1 Merge branch 'feature/dynmulti' into feature/dynmulti-expansion 2023-12-26 14:22:49 +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