Commit graph

15236 commits

Author SHA1 Message Date
Eduardo Quezada
d42de03ddc Merge branch '_RHH/master' into _RHH/upcoming 2024-04-25 12:37:31 -04:00
Eduardo Quezada
89a1abd7b4 Added separate palettes for Gen4-6 mon 2024-04-25 08:30:59 -04:00
Alex
94cb2133c6
Fixes ability dancer not targeting multiply targets (#4437)
* Fixes ability dancer not targeting multiply targets

* remove file
2024-04-25 10:13:57 +02:00
Martin Griffin
143d6fb289
Minor cleanup of Frisk test (#4441) 2024-04-25 10:11:01 +02:00
Martin Griffin
baaefb4d72
Add missing shouldDynamax (#4442) 2024-04-25 10:10:36 +02:00
Eduardo Quezada
3710fb5331 Fixed Shiny Palettes not visible in the debug menu 2024-04-24 14:52:07 -04:00
Alex
6f538d840c
Combine weather set commands (#4434)
* Combine Weather set commands

* further tests

* minor error

* update test names
2024-04-24 14:10:25 -04:00
AgustinGDLV
536e4a8fb9
fixed psychic type tera icon (#4435) 2024-04-24 18:08:20 +02:00
AgustinGDLV
84a9d4ffcf
Terastallization (#4110)
* wrote foundational terastal tests

* implemented baseline test-only Tera functionality; modified GetBattlerType + STAB calculations, misc. changes to some moves

* added tests and func. for Stellar type, more tests for Tera Blast

* more tests for Stellar type, Conversion fixes, Color Change + Conversion2 future proof

* implemented tera blast, expanded stellar type func., fixed tests

* last set of Tera/Tera Blast tests for checklist, protean fix

* implemented in-battle Terastallization, WIP stellar indicator and tera animation

* fixed bad merge

* expanded NUMBER_OF_MON_TYPES, cut down on TYPE_STELLAR hackiness, added Stellar type to summary

* fixed type indicators

* added tera logic to AI

* implemented code review changes, added B_TERA_ORB_NO_COST

* updated AI to calc damage with Tera when applicable; minor rework to AI gimmick handling

* fixed Tera Blast split choice occuring when not Terastallized

* fixed Tera Blast using Last Respects BP calcs

* added tera type to TrainerMon, code review tweaks
2024-04-24 11:17:46 +02:00
Martin Griffin
87dca8eb1c
Fix typo in Rotom Catalog (#4433)
https://discord.com/channels/419213663107416084/774393519569502268/1232372639562072084
2024-04-23 21:49:22 +02:00
Alex
aaaccbfe6c
Adds support for shouldDynamax and shouldTerastal in trainer parties (#4431) 2024-04-23 17:54:46 +01:00
sneed
edc98d664f
pokedex expYield matches SpeciesInfo type (#4432) 2024-04-23 18:51:03 +02:00
Eemeliri
dbbe397095
Fix Lycanroc dusk and midnight form backsprites and adjust back offset (#4430) 2024-04-23 14:16:32 +02:00
Bassoonian
308475a163
Make trainerproc compatible with partners (#4421)
* Prepare stuff for MGriffin to fix

* Remove doubleBattle from migration script

* Support PARTNER_NONE in trainerproc

* Let script apply to battle_partners.h file

* TRAINER_BACK_PIC

* Let script fix issues

---------

Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2024-04-22 17:03:36 +02:00
Martin Griffin
b24714a597 Fix GiveBoxMonInitialMoveset_Fast 2024-04-22 15:50:12 +02:00
kittenchilly
d398b9e8e7
Fix ABILITY_POPUP not respecting abilityPopupOverwrite in tests (#4423) 2024-04-22 10:49:53 +02:00
sneed
fa53e97f0c
Add thunder cage to trapping move array (#4426)
* Add thunder cage to trapping move array

* align sTrappingMoves vertically
2024-04-22 10:42:46 +02:00
Bassoonian
6bde095ae8
Partner fixes (#4422)
* Partner fixes

* Generalise TRAINER_PARTNER(PARTNER_NONE)
2024-04-22 10:20:37 +02:00
LOuroboros
9097f438f1
Fixes Will-O-Wisp's capitalization in gMovesInfo (#4425) 2024-04-22 09:58:17 +02:00
Eduardo Quezada
a200fe1590 Read separate palettes and apply it to Gen 1-3 2024-04-21 10:20:23 -04:00
Alex
81a73deb76
Fixes Quash (#4419)
* Fixes Quash

* Update test/battle/move_effect/quash.c

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

* Update test/battle/move_effect/quash.c

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-04-21 15:40:35 +02:00
sneed
620c453fbd
Intimidate and Super Sweet Sugar prints the right message and doesn't play animation when already at -6 (#4406)
* Intimidate won't print message or play animation at -6

Super Sweet Syrup included

* Update intimidate.c

* Update supersweet_syrup.c

* Update test/battle/ability/supersweet_syrup.c

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-04-21 14:10:14 +02:00
Eduardo Quezada
6061400073 Added separate palette data for followers 2024-04-20 18:35:55 -04:00
Alex
49c86f86c8
Adds Ability Poison Puppeteer (#4416)
* Adds Ability Poison Puppeteer

* nothing happened

* parametrize poison powder and toxic

* leftover
2024-04-20 22:23:20 +02:00
Eduardo Quezada
3d9c7732f6 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
# Conflicts:
#	include/event_object_movement.h
#	src/data.c
#	src/data/graphics/pokemon.h
#	src/data/pokemon/species_info/gen_4_families.h
2024-04-20 13:23:14 -04:00
Eduardo Quezada
c4c371824f Merge branch '_RHH/master' into _RHH/upcoming 2024-04-20 08:22:49 -04:00
Alex
4b048c327b
Pokemoncommunity sprites (new batch) (#4414) 2024-04-20 07:58:21 -04:00
kittenchilly
88ce33c864
Add further icon sprite changes and fixes (#4413) 2024-04-20 09:41:01 +02:00
Eduardo Quezada
6c2c66b110
Fixed data type for generated fishing species (#4412) 2024-04-19 18:06:08 +02:00
Eduardo Quezada
4f0d98ec52
Fixed datatypes for Ability inheriting (#4411) 2024-04-19 18:05:45 +02:00
Alex
be093e7414
Couple comment changes (#4409)
* comment_change

* fix comment

* an other correction

* fix fix comment

* Update include/constants/battle_ai.h

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-04-19 16:34:44 +02:00
Jared Schoeny
76f79215c7
Update macOS instructions in INSTALL.md (#4407) 2024-04-19 12:20:26 +02:00
sneed
5f4d565c86
Combine AI smart switching with smart mon choices automatically and disable smart mon choices in double battles. (#4405)
* AI_FLAG_SMART_SWITCHING  also sets AI_FLAG_SMART_MON_CHOICES

* Disable AI_FLAG_SMART_MON_CHOICES in doubles
2024-04-18 23:16:36 +02:00
Martin Griffin
4fa5ae24e1
Fix AI test error messages (#4404) 2024-04-18 12:49:54 +02:00
Alex
4d5a745e31
Fix bug involved infinite loop when player mon has only status moves (#4403) 2024-04-18 10:34:33 +02:00
LOuroboros
d08fb8e824
Turned B_RESTORE_HELD_BATTLE_ITEMS into a non-boolean config (#4402)
* Corrected the comment description of B_RESTORE_HELD_BATTLE_ITEMS

* Made B_RESTORE_HELD_BATTLE_ITEMS a non-boolean config
2024-04-18 09:03:39 +02:00
kittenchilly
e19b05a3a9
Add Fog weather (#4359)
* Add Fog weather

* Update battle_string_ids.h

* Update battle.h

* some tweaks

* Update battle_anim_scripts.s

* Address reviews

* Update battle_util.c

* Update battle_util.c

* Update include/config/battle.h

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

* Address reviews, changes, fix bugs

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-04-17 12:06:49 -04:00
psf
fcf90ab52d
Fishing Enhancements (#4343)
* Implemented chain fishing

* Added configs

* I_FISHING_MINIGAME implemented

* Refactored Check For Bite

* CLeaned up version of metatile checks

* Removed debug script

* Added helper functinons

* Cleaned up CalculateFishingProximityOdds

* Added new constatnts for cardinal direction and axis

* Updated with constants

* Reordered functions

* Cleaned up some functions

* Moved constants

* Created UpdateChainFishingSpeciesAndStreak
When 3 sides are blocked, every cast will get a mon

* Created DoesFishingMinigameAllowCancel

* Removed fishing chain check

* Fixed bug where streak was not incremented correctly
Fixed bug where Land was not properly counted
Fixed bug where streak was always being read as maxed

* Updated variable and function names

* Updated variable and function names

* Moved UpdateChainFishingSpeciesAndStreak to happen before shiny rolls occur

* Removed debug statements

* Applied feedback from https://github.com/rh-hideout/pokeemerald-expansion/pull/4343\#discussion_r1551278416

* Fixed default item config and changed gChainFishingDexNavStreak and sLastFishingSpecies to only use EWRAM when features are enabled

* Update include/config/item.h

Include feedback from https://github.com/rh-hideout/pokeemerald-expansion/pull/4343#discussion_r1567145660

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

* Changed Dexnav to DexNav per https://github.com/rh-hideout/pokeemerald-expansion/pull/4343\#discussion_r1567145660

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-04-16 22:53:50 +02:00
LOuroboros
0d95354a82
Made competitive party syntax no longer print the contents of PATH (#4397) 2024-04-16 07:35:47 +01:00
Eduardo Quezada
5a276dcbbf Merge branch '_RHH/master' into _RHH/upcoming 2024-04-15 18:29:06 -04:00
Eduardo Quezada
159eb1aea9 Untag release 2024-04-15 17:51:27 -04:00
Eduardo Quezada
ab5c2d9161
Version 1.8.2 (#4394) 2024-04-15 17:47:50 -04:00
sneed
634dcf5e26
Actually disable forms when disabling forms (#4395)
* Remove form table data when forms are disabled

* Remove erroreous edit

* Add missing G-Max checks

* Update form_species_tables.h
2024-04-15 16:01:52 -04:00
Bassoonian
e8890bc8f3
Fix teachable learnsets crashing in some environments (#4389) 2024-04-15 15:57:42 -04:00
Damon Murdoch
ecf70d365c
[Rebase of #4286] Reordered Debug_EventScript_InflictStatus1 (#4372)
* Update debug.inc

Created new merge as per discussion in discord, previous pull request https://github.com/rh-hideout/pokeemerald-expansion/pull/4286

* Added new file 'config.inc' as per feedback

Added new file 'config.inc' as per feedback

* Restore order

* fixed, my bad

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-04-14 17:31:39 -04:00
sneed
fd87a79b27
Pokedex plus defaults to male icons and front pics (#4390)
* Pokedex defaults to male icons and front pics

* Choose palette from personality

* Unknown icon matches front pic
2024-04-14 17:23:14 -04:00
Eduardo Quezada
fbff04d4e3
Fixed silent Klefki cry (#4392)
* Fixed Klefki's cry not being hearable

* Added warning to family toggle file
2024-04-14 21:06:17 +02:00
Alex
952183889a
Fixes Ability Shield, Neutralizing Gas interaction (#4391)
* Fixes Ability Shield, Neutralizing Gas interaction

* test was wrong
2024-04-14 18:43:55 +02:00
Alex
5bf6a252b5
Fixes Eject Pack softlocking the game (#4387) 2024-04-14 02:43:16 +02:00
PCG
a8a8344ba2
Include Memento effect in IsStatLoweringEffect (#4386) 2024-04-13 16:54:59 -04:00