Commit graph

14782 commits

Author SHA1 Message Date
RavePossum
69b367e350 PR feedback - 32 bit params, multiline condition formatting 2024-06-03 00:10:10 -04:00
RavePossum
afb66b4d2b preproc assets, move config to overworld config, add some antialiasing to graphics, consistency in naming gens 2024-05-07 23:58:29 -04:00
RavePossum
86800d25dd add restore newline at end of menu.c 2024-04-15 22:44:20 -04:00
RavePossum
0620ac3a90 add newline to end of config file 2024-04-15 22:43:30 -04:00
RavePossum
a7701dd61b fix BW theme table names 2024-04-15 17:02:08 -04:00
RavePossum
46f11caa27 cleanup for bw theme 2024-04-15 16:56:14 -04:00
RavePossum
8499f6878d remove unnecessary ubfix check 2024-04-15 16:56:14 -04:00
RavePossum
7e4daea0ed rip out preprocs in favor of inlines, fix typo/wording 2024-04-15 16:56:14 -04:00
RavePossum
406f87c534 first stab at making configable BW map pop-ups in expansion 2024-04-15 16:56:14 -04:00
Eduardo Quezada
5bf379720f Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	src/data/moves_info.h
2024-04-12 21:30:52 -04:00
Eduardo Quezada
91286123d1
Mid-April pret merge (#4380) 2024-04-12 09:13:57 -04:00
Bassoonian
8329d8368d Merge branch 'master' of https://github.com/pret/pokeemerald into pretmergemidapril 2024-04-12 12:16:28 +02:00
Alex
35e04b84a8
Fixes Cud Chuw (#4379)
* Fixes Cud Chuw

* small correction
2024-04-12 12:15:49 +02:00
Alex
ee3a577240
Fixes givemon moves not defaulting to none (#4377) 2024-04-11 20:34:11 +01:00
GriffinR
af0165a35d
Merge pull request #1987 from PokemonSanFran/cancelGroundEffectsCamera
Added fix to Keep the Camera from Making Waves
2024-04-11 14:41:04 -04:00
GriffinR
a0637251f8
Merge pull request #1986 from LOuroboros/patch-1
Updated value of gMain.inBattle at OpponentHandleEndLinkBattle
2024-04-11 14:39:00 -04:00
GriffinR
0b73cd81d8
Merge pull request #1985 from PokemonSanFran/surfingDismountFix
BUGFIX for Surfing Dismount Ground Effects
2024-04-11 14:38:40 -04:00
Alex
5d9f78bcb5
Fixes bug preventing Belch from usage after Stuff Cheeks (#4376) 2024-04-11 10:42:55 +02:00
Alex
62d054e135
Future Sight fixes (#4350)
* Future Sight fixes

* handle life orb boost

* applied review

* Future Sight changes

* removed future sight no hit string

* agbcc

* Update battle_scripts.h
2024-04-11 10:23:16 +02:00
Bassoonian
ac2df373d6
Makes trainerproc OSX-compatible (#4374) 2024-04-10 17:52:50 +01:00
kittenchilly
3fb52b6b0e
Change Frostbite abbreviation from FSB to FRB (#4355)
* Change Frostbite abbreviation from FSB to FRB

* Melted the ice is actually the one used

* Update moves_info.h

* Update moves_info.h

* Update items.h
2024-04-10 09:16:32 +02:00
psf
24e3ca267b
Add OW_HIDE_REPEAT_MAP_POPUP config (#4370)
* Added first working version

* Fixed spacing and set config to false

* Update src/overworld.c

Updated spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/4370#discussion_r1555917636

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

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-04-10 09:10:37 +02:00
Alex
3c85089428
Fixes Gulp Missile Dive / Power Herb interaction (#4371)
* Fixed Cramorant Dive / Power Herb interaction

* remove file

* leftover
2024-04-09 10:32:11 +02:00
Philipp AUER
b5c7332182
feat: check if inside of git repository before building (#4363)
* feat: check if inside of git repository before building

* pokemon_expansion -> pokeemerald-expansion

---------

Co-authored-by: sbird <sbird@no.tld>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-04-07 10:43:04 -04:00
Eduardo Quezada
d8072795db
Fixed trainerproc skipping numbers when writing species IDs (#4366)
Credit for MGriffin for the fix
2024-04-07 15:10:29 +01:00
Martin Griffin
41ddd911b7
Include gba/defines.h in gba/types.h (#4364)
If gba/types.h is included before gba/defines.h, it ends up declaring a
variable named PACKED rather than specifying that BgCnt should be
packed.
2024-04-07 13:08:35 +02:00
Martin Griffin
297def722a
Fix trainer_starting_status_definition (#4362) 2024-04-07 10:01:25 +02:00
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