Commit Graph

10512 Commits

Author SHA1 Message Date
skolgrahd
3b17ce39f7
Fixed softlock w/ weather-triggered form changes & Cloud Nine (#4382)
* Fixed softlock when weather-triggered form changes are suppressed by Cloud Nine

* Removed KNOWN_FAILING; line from Castform Air Lock test
2024-04-13 13:19:14 -04:00
Alex
a0a5ba4af2
Adds Role Play tests (#4381)
* Adds Role Play tests

* gastro acid

* Update gastro_acid.c
2024-04-13 14:14:43 +02: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
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
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
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
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
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
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
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
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
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
DizzyEggg
6abd75b055
fix broken battle arena gfx (#4307) 2024-03-26 17:23:57 +01: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
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
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
Eduardo Quezada
dbd7e2a7c8
Fixed DisplayCaughtMonDexPage graphical issue + cry (#4279) 2024-03-14 09:42:09 +01:00
Eduardo Quezada
3066216389
Type array tweaks (#4276)
* Using Z-Moves in type array

* Added Arceus form data
2024-03-12 12:32:06 +01:00
Eduardo Quezada
1568b0a424
Pre-1.8 tweaks (#4275)
* Moved BERRY_MUTATION_CHANCE to include/config/overworld.h and renamed it to OW_BERRY_MUTATION_CHANCE

* Move level_caps.h to config folder

* Multiple EV/IV refered as EVs/IVs

* Disabled decap by default

* Level up learnsetst comments
2024-03-12 12:21:03 +01:00
Frank DeBlasio
2f4203bc4c
Consolidate type properties (#4185)
* Moved gTypeNames into gTypes

* Added invalid move text to struct

* Added max move to struct

* Added icon palette to struct

* Added macros for invalid and max moves

* Swapped palette and max move order

* Renamed invalid to generic

* Renamed invalid to generic in struct definition

* Added zMoves and items to type struct

* Addressed comments

* Incorporated newer comments

* Updated comment format
2024-03-12 07:57:38 -03:00
Alex
a741e2e396
Couple things for 1.8 release (#4274)
* Couple things for 1.8 release

* revert EFFECT_VARY_POWER_BASED_ON_HP change

* Fix comment

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-03-12 07:51:37 -03:00