Commit graph

15064 commits

Author SHA1 Message Date
psf
36cd976a03
Added OW_PC_MOVE_ORDER config (#4348)
* Added OW_PC_MOVE_ORDER config

* Implemented feedback from https://github.com/rh-hideout/pokeemerald-expansion/pull/4348\#pullrequestreview-1981473856
2024-04-07 09:52:58 +02:00
Alex
c740c4ba19
Disguise fixes + gen8 hp loss config (#4360)
* Disguise fixes + gen8 hp loss config

* fix battler arg

* Update test/battle/ability/disguise.c

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-04-07 00:07:55 +02:00
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
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 33486816cf.

* Revert "Revert "Ursaluna Bloodmoon""

This reverts commit 2d0e90e51d.

* 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
2baa3525e1
Fixes ability pop up config (#4339) 2024-04-04 14:51:07 +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
Eduardo Quezada
d580c980a7
Clarify to not use the "Download ZIP" option (#4336)
* Clarify to not use the "Download ZIP" option.

* Link to TAAR guide

* Further discouraging
2024-04-03 20:29:46 +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
7c1a0bb685
defiant_tests (#4331) 2024-04-02 21:32:19 +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
ghoulslash
e1f6480e32
Random Pyramid Encounter fixes (#4326) 2024-04-01 14:58:36 -04: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
Bassoonian
0acd058c16
Fix style of some bit definitions (#4319) 2024-03-29 17:43:33 +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
8c7ba8a849
Fix formatting of plates (#4318) 2024-03-29 16:49:29 +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
9b2feafdf2 Non-tagged 2024-03-24 17:52:47 -03:00
Eduardo Quezada
024848a9e9
Version 1.8.1 (hotfix) (#4303) 2024-03-24 16:07:49 -03:00
Eduardo Quezada
30851b0ad8
Fixed Egg's summary screen softlock (#4301) 2024-03-24 18:59:28 +01: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
Eduardo Quezada
795b927dfc
Added pre-1.6.2 changelogs (#4296)
* Added pre-1.6.2 changelogs

* Fixed missing emoji lol
2024-03-24 12:16:20 +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