11379 Commits

Author SHA1 Message Date
Martin Griffin
8bd5ac2e7a
Competitive-formatted parties (#3545)
$ python3 migration_scripts/convert_parties.py src/data/trainers.h src/data/trainer_parties.h src/data/npc_trainers.party
Is available to convert Trainer Control-formatted trainers/parties into
Competitive-formatted ones.

Multiple '#include's can be placed in the trainer section of src/data.c
to support spreading the trainers across multiple .party files.

trainerproc does not interpret the values, leaving that job to the C
compiler, so we use '#line' to associate those errors with the lines in
the .party file(s). Because the columns don't make sense we use
-fno-show-column and -fno-diagostics-show-caret. We might want to move
gTrainers into its own file so that the rest of src/data.c isn't
affected by those flags.

Extensions (misfeatures, imo):
- .party files are passed through cpp, so '#define's are supported, and so
  are '// ...' and '/* ... */' comments.
- .party files also support writing, e.g. 'SPECIES_PIKACHU' instead of
  'Pikachu'. This allows people to write constants explicitly if they
  like.

Pragmas:
- '#pragma trainerproc ivs explicit' requires an explicit 'IVs:' line
  rather than defaulting to 31s.
- '#pragma trainerproc ivs <IVs>' changes the default IVs.
- '#pragma trainerproc level explicit' requires an explicit 'Level:'
  line rather than defaulting to 100.
- '#pragma trainerproc level <level>' changes the default level.

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-04-06 15:05:15 -03:00
RavePossum
5530eb7501 merge with pret 2024-04-06 11:17:00 -04:00
kittenchilly
77db5d9d1e
Update almost all Gen 9 icon sprites + add the missing ones (#4290)
* Ogerpon form icons

* Sprigatito family

* Fuecoco family

* Quaxly family

* Lechonk family

* Tarountula family

* Nymble family

* Pawmi family

* Tandemaus family

* Fidough family

* Smoliv family

* Squawkabilly forms

* Nacli family

* Charcadet family

* Tadbulb family

* Wattrel family

* Maschiff family

* Shroodle family

* Bramblin family

* Toedscool family

* Klawf

* Capsakid family

* Rellor family

* Flittle family

* Tinkatink family

* Wiglett family

* Bombirdier

* Finizen family

* Varoom family

* Cyclizar

* Orthworm

* Glimmet family

* Greavard family

* Flamigo

* Cetoddle family

* Veluza

* Dondozo

* Tatsugiri forms

* Annihilape

* Clodsire

* Farigiraf

* Dudunsparce

* Kingambit

* Great Tusk

* Scream Tail

* Brute Bonnet

* Flutter Mane

* Slither Wing

* Sandy Shocks

* Iron Treads

* Iron Bundle

* Iron Hands

* Iron Jugulis

* Iron Moth

* Iron Thorns

* Frigibax family

* Gimmighoul family

* Treasures of Ruin

* Roaring Moon

* Iron Valiant

* Paradox duo

* Walking Wake

* Iron Leaves

* Dipplin

* Poltchageist family

* The Loyal Three

* Ursaluna Bloodmoon

* Revert "Ursaluna Bloodmoon"

This reverts commit 33486816cf19ebe4b868117824c0ac77e183e806.

* Revert "Revert "Ursaluna Bloodmoon""

This reverts commit 2d0e90e51d896517821cda42aea5bb5fabd0b61e.

* Oops, out of order :(

* Paldean Tauros breeds

* PLA New Pokemon

* PLA Hisuian Forms

* Archaludon

* Hydrapple

* Gouging Fire

* Raging Bolt

* Iron Boulder

* Iron Crown

* Terapagos forms

* Pecharunt

* Partner Pikachu

* Partner Eevee

* Address reviews

* Arboliva tweak
2024-04-06 11:26:16 +02:00
pkmnsnfrn
f9d690bafe Added fix to Keep the Camera from Making Waves 2024-04-05 14:58:31 -07:00
LOuroboros
3135a1fc2b
Updated value-setting of gMain.inBattle at OpponentHandleEndLinkBattle 2024-04-05 17:04:46 -03:00
PCG
d8af6205e9
Fix typo in Booster Energy's battle message (#4354)
* Fix typo in Booster Energy's battle message

* fixed in tests too

* fix another typo
2024-04-05 20:37:23 +02:00
Bassoonian
4aeae4a52e
Fix Trainer Slide message misbehaving (#4353) 2024-04-05 20:17:30 +02:00
Bassoonian
e4d81150c0
Add Earth Eater AI code (#4352) 2024-04-05 20:01:33 +02:00
Nephrite
93af96c10c
Replaces VARARG_8 uses with recursive macros (#4232) 2024-04-05 18:42:11 +01:00
Alex
db42d2b5a4
Adds Booster Energy (#4337)
* Adds Booster Energy

* fix string

* fixes strings in tests

* Apply suggestions from code review

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-04-05 19:38:50 +02:00
sneed
520efa01c8
Fixes Guts countering frostbite spAtk reduction (#4351) 2024-04-05 18:11:11 +02:00
pkmnsnfrn
71b8d20397 Replaced magic numbers regarding triggerGroundEffectsOnMove to TRUE / FALSE 2024-04-04 16:21:34 -04:00
pkmnsnfrn
7ee921e9da Added BUGFIX for groundEffectsOnMove when the player stops Surfing 2024-04-04 16:17:48 -04:00
Alex
d1c2a10af6
Fixes switch in AI bug (#4338)
* Fixes switch in AI bug

* fixes fix

* test
2024-04-04 19:52:45 +02:00
Alex
c52ae074ab
Fixes Protective Pads Fluffy interaction (#4340)
* Fixes Protective Pads Fluffy interaction

* couple more tests
2024-04-04 14:48:57 +02:00
psf
4a102dca8e
Add explanation of STATIC_ASSERTS in pokemon.c (#4294) 2024-04-04 06:08:34 +01:00
psf
8f2f6811fb
Added B_FAST_EXP_GROW (#4335)
Updated the denominator in MoveBattlerBar to be faster for more HP sizes
2024-04-03 21:25:55 +02:00
kittenchilly
e8c05debce
Add unique icons for all of Arceus's forms (#4329) 2024-04-03 20:40:45 +02:00
AgustinGDLV
c340ae04d7
Updated Knock Off (#4333)
* added config for updated Knock Off behavior, added tests

* fixed unused var

* added item check in tests

* fixed item checks
2024-04-03 10:13:39 +02:00
Alex
29a4444fc1
Pecharunt sprite from pokemoncommunity (#4324)
* Pecharunt sprite from pokemoncommunity

* disable icon sprite
2024-04-02 21:32:47 +02:00
Alex
f65fc5f849
Fix totem boost not triggering (#4328) 2024-04-02 11:06:14 +02:00
Alex
f5a5932e4d
Fixes Soft Level Cap issue (#4327) 2024-04-01 23:42:14 +02:00
Alex
a54d641943 fix get base species id 2024-04-01 20:38:58 +02:00
Alex
f58bec2397 Random Pyramid Encounter fixes 2024-04-01 20:31:01 +02:00
Alex
92e23415ab
Change freeze dry to allow easier extendebility (#4312)
* Change freeze dry to allow easier extensibility

* give body press the foul play treatment

* Tests
2024-03-31 19:15:18 +02:00
Zimmermann Gyula
8f6f744e7f
Check for the correct battler's No Guard. (#4320) 2024-03-30 11:46:15 +01:00
DizzyEggg
46e6324fe2
Fix White Herb Known Failing tests (#4258)
* Fix White Herb Known Failing tests

* get out agbcc

* remove unneeded white herb test
2024-03-29 17:43:05 +01:00
Bassoonian
9527f1e175 Fix formatting of plates 2024-03-29 15:31:28 +01:00
Bassoonian
f038dbba9e
Pret merge (2024/03/24) (#4304) 2024-03-29 14:18:14 +01:00
DizzyEggg
4a8551247a
Fix Z mirror move (#4308) 2024-03-29 11:33:28 +01:00
ghoulslash
5a986c6d04
Customizable FrontierMon Sets (#4313)
* more customization to struct FacilityMon, remove facility item ids, convert vanilla data, add CreateFacilityMon universal function

* fix some unused vars

* use TrainerMon struct instead of FacilityMon

* add dynamaxLevel, gigantamaxFactor to CreateFacilityMon

* some struct TrainerMon documentation

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-03-29 08:47:17 +01:00
DizzyEggg
6abd75b055
fix broken battle arena gfx (#4307) 2024-03-26 17:23:57 +01:00
Eduardo Quezada
b58ccac4bf
Master into upcoming merge (#4306) 2024-03-26 12:49:07 -03:00
ravepossum
68fa212738
Fix Receiving Zero Exp When Below Level Cap (#4305)
* fix logic for calculating exp from level cap when below cap

* Update src/level_caps.c

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>

---------

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2024-03-26 08:58:00 +01:00
Eduardo Quezada
e479fa1007 Merge with latest merrp branch + starting to move the functionality of separate palettes to gSpeciesInfo 2024-03-25 16:03:56 -03:00
Eduardo Quezada
3d181e5c70 Merge remote-tracking branch '_pret/master' into _RHH/pr/master/pret_sync20240324
# Conflicts:
#	src/battle_anim_fight.c
2024-03-24 13:52:18 -03:00
Eduardo Quezada
88565970c8
Fixed unintended form behavior (#4299) 2024-03-24 12:19:24 +01:00
GriffinR
f19747d6cc
Merge pull request #1983 from LOuroboros/modernfateful
Renamed ScrCmd_setmonmodernfatefulencounter and ScrCmd_checkmonmodernfatefulencounter for consistency reasons
2024-03-21 21:28:30 -04:00
GriffinR
b08d62b615
Merge pull request #1961 from GriffinRichards/doc-camera-sprite
Document camera sprite functions
2024-03-21 21:23:53 -04:00
Eduardo Quezada
3623694789
Actually remove unused STATUS3_CANT_SCORE_A_CRIT (#4293) 2024-03-20 23:19:18 +01:00
AtariDreams
21ed70c007
Do not do VBlankIntrWait if using the wireless adapter (#3730)
* Do not do VBlankIntrWait if using the wireless adapter

Desynchronization can occur otherwise.

* Fix formatting

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>

---------

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2024-03-19 08:29:47 -03:00
Eduardo Quezada
f419de24d9
Removed Gen 9 settings for out-of-battle abilities (#4282)
* Removed Gen 9 settings for out-of-battle abilities

* Updated OW_SYNCHRONIZE_NATURE comment
2024-03-18 08:24:44 +01:00
Eduardo Quezada
39ed85635f Merge remote-tracking branch '_RHH_origin/upcoming' into _RHH/pr/upcoming/merrpFollowers
# Conflicts:
#	include/data.h
#	src/data/graphics/pokemon.h
#	src/data/pokemon/species_info.h
#	src/data/pokemon/species_info/gen_1_families.h
#	src/data/pokemon/species_info/gen_2_families.h
#	src/data/pokemon/species_info/gen_3_families.h
#	src/data/pokemon/species_info/gen_4_families.h
#	src/data/pokemon/species_info/gen_5_families.h
#	src/data/pokemon/species_info/gen_6_families.h
#	src/data/pokemon/species_info/gen_7_families.h
#	src/data/pokemon/species_info/gen_8_families.h
2024-03-17 23:41:23 -03:00
kittenchilly
920289641a
Add evolution method for Gimmighoul, EVO_LEVEL_ITEM_COUNT_999 (#4261)
* Add evolution method for Gimmighoul, EVO_LEVEL_COLLECT_999

* Change to EVO_LEVEL_ITEM_COUNT_999

* Make logic use less duplicate code

* Update gen_9_families.h

* Update party_menu.c

* Address reviews
2024-03-17 22:03:40 +01:00
tertu
7ac8aac913
Add LocalRandomSeed (#4278) 2024-03-16 19:55:01 +00:00
Eduardo Quezada
7c25db5200
Fill data for placeholder species (#4281)
* Absolute IDs

* Mothim internal forms

* Scatterbug/Spewpa internal forms

* Fixed Mothim not having form tables

* Totem Alolan Raticate

* Moved shared dex text to its own folder

* Totem Mimikyu

* Added missing empty third-ability fields

* Totem Gumshoos + missing totem flags

* Renamed files to better match their contents

* Fixed Disguise on Totem Mimikyu

* Totem Vikavolt/Alolan Marowak + missing Gumshoos form table

* Totem Ribombee/Araquanid/Lurantis/Salazzle

* Totem Togedemaru/Kommo-O

* Partner Pikachu/Eevee

* Reintroduced shinyLocked species flag for convenience

* Revert "Reintroduced shinyLocked species flag for convenience"

This reverts commit 3e07bd378ba6a249effe0aed83a424d0c775f236.
2024-03-16 18:38:43 +01:00
LOuroboros
15aa909944
Updated OW_SYNCHRONIZE_NATURE statement in ScriptGiveMonParameterized (#4271)
Fixes an issue where the nature of a Deoxys would be randomized even if one was set at the time of calling givemon or the functions related to it.
2024-03-14 22:02:19 +01:00
Eduardo Quezada
6804e82c0a
Revert gSpeciesInfo "INFO" macros (#4230)
* Venusaur, Charizard, Blastoise

* Butterfree, Beedrill, Pidgeot

* Rattata, Raticate

* Expanded the rest of Gen 1 macros

* Expanded Gen 2 macros

* Expanded Gen 3 macros

* Expanded Gen 4 macros

* Expanded Gen 5 macros

* Expanded Gen 6 macros

* Expanded Gen 7 macros

* Expanded Gen 8&9 macros

* Removed trailing macro slashes

* Expanded macros for sprites, pals, icons and learnsets (using shasum)

* AMEND ME

* Gen 1 fully reordered (thanks Alex!)

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Gen 2 fully reordered (thanks Alex!)

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Gen 3 fully reordered (thanks Alex!)

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Gen 4 fully reordered (thanks Alex!)

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Gen 5 fully reordered (thanks Alex!)

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Gen 6 fully reordered (thanks Alex!)

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Gen 7 fully reordered (thanks Alex!)

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Gen 8 fully reordered (thanks Alex!)

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Gen 9 fully reordered (thanks Alex!)

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-03-14 17:47:38 -03:00
Alex
b5af343dc4
Reverts additional move effect macros (#4277) 2024-03-14 17:20:13 -03:00
Eduardo Quezada
68e5c9f8cb Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	include/battle.h
#	src/pokedex.c
2024-03-14 11:41:27 -03:00