Commit graph

6649 commits

Author SHA1 Message Date
Bassoonian
d4387d880c
Replace hardcoded flute check with consumability check (#5508) 2024-10-16 12:07:34 +02:00
Eduardo Quezada
9ed153ff93 Merge branch '_RHH/master' into _RHH/pr/master/pretSync20241015 2024-10-15 22:22:52 -03:00
Eduardo Quezada
80447bee8e Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015 2024-10-15 20:56:56 -03:00
luckytyphlosion
a55c75d350
Get rid of common syms (#2040) 2024-10-14 23:52:11 -04:00
GriffinR
a0be2cbf7b Fix Fallorbor typo 2024-10-12 23:50:12 -04:00
Eduardo Quezada
0a4b3a8dd7 Merge branch '_RHH/master' into _RHH/upcoming 2024-10-12 16:23:27 -03:00
Bassoonian
eedeaf1ead
Clean up scrcmd PR (#5511)
Renamed CheckPartyHasSpecie to CheckPartyHasSpecies and cleaned up function calls
2024-10-12 10:34:05 -07:00
Bassoonian
8dba27249c Merge branch 'followers-expanded-id' of https://github.com/aarant/pokeemerald into merrpmerge1210 2024-10-12 18:41:33 +02:00
Ariel A
e10005010e Merge branch 'followers' into followers-expanded-id 2024-10-12 12:27:05 -04:00
Ariel A
d80190fe10 fix: Dig in Sealed Chamber no longer freezes follower. Fixed #5482 rhh 2024-10-12 12:23:18 -04:00
psf
0ef3f7dedd
Merge branch 'upcoming' into scriptCommands 2024-10-11 16:27:02 -07:00
ghoulslash
353915ef64
Add various tests, add RNG_RANDOM_TARGET (#5438)
* burn dmg test depends on config

* burn and frostbite tests use B_BURN_DAMAGE config for denom val

* update kings shield test with config

* add RNG_RANDOM_TARGET, use SetRandomTarget in HandleAction_UseMove target acquisition, update uproar test to PASSES_RANDOMLY since test will fail if you target the soundproof voltorb. Slightly faster UproarWakeUpCheck

* add sticky web+contrary test

* add EXPECT_EQ to contrary+sticky web test

* Update src/battle_script_commands.c

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

* Update src/battle_util.c

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

* Update test/battle/move_effect/uproar.c

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

* fix test

* syntax fix

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-10-11 23:47:46 +02:00
SarnPoke
2db1f071fa
Add battle flag that prevents running from wild Pokémon (#5502)
* Add No Running Battle Flag

Adds a flag that if set prevents the player from being able to run from wild battles.

* Formatting battle_util.c

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

* Adjust for pre-Gen 8 Teleport

Addresses the edge case with Teleport when used with under Gen 8 mechanics.

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-10-11 21:59:50 +02:00
Pawkkie
464c90a862
ShouldSwitchIfGameStatePrompt Tests (#5462)
* Weird tests plz help <3

* better RNG tag names?

* DATA.trial for data to reset between trials

* Fix Wonder Guard test

* Unused errors

* Finish new tests

* Split fix into its own PR

* Spacing

* Rename RNG_AI_SWITCH_TOXICD

* Forgot to save file lol

---------

Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2024-10-11 19:57:19 +02:00
hedara90
cac815164a
Cleanup extraneous function in header (#5506) 2024-10-11 12:14:14 +02:00
kittenchilly
5b4acea651
Add config to change Vivillon's breeding form (#4813)
* Add config to change Vivillon's default form

* Update daycare.c

* Remove the default form stuff

* Update daycare.c

* Clean up

* Assert and fancy
2024-10-10 21:27:50 +02:00
ghoulslash
9dbcd18251
Unify GetBattlerAbility/TerrainAffected to remove duplicate ai function (#5497) 2024-10-10 10:42:09 -04:00
Bassoonian
d0379b9b55
Turn item hold effects into an enum (#5498)
* Turn item hold effects into an enum

* Rename to ItemHoldEffect
2024-10-10 14:23:59 +02:00
Pawkkie
2afc7f6138
ShouldPivot type cleanup (#5441)
* Cleanup ShouldPivot type

* PIVOT to SHOULD_PIVOT
2024-10-10 12:54:35 +02:00
AlexOn1ine
d0a97970ba Unify GetBattlerAbility/TerrainAffected to remove duplicate ai function 2024-10-10 09:55:25 +02:00
Alex
1454644376
Removes duplicate code in AI functions (#5457)
* Make functions CanAbilityAbsorbMove and CanAbilityBlockMove

* clean up

* Replace ai code with CanAbilityBlockMove / CanAbilityAbsorbMove

* Adds CanPartnerAbilityBlockMove

* Use switches instead of if-blocks

* solve potential bug in singles with spread attacks

* fix test

* revert other fix

* flash fire does not increase a stat

* left a comment for a future test and addition

* remove more checks

* comment was incorrect. it only applies to storm drain and lightning rod

* revert ndebug

* revert minor change

* Update src/battle_util.c
2024-10-09 15:50:59 +02:00
SonikkuA-DatH
708f64247f
Heart Swap Move Animation (#5460) 2024-10-09 10:43:04 +02:00
Eduardo Quezada
ee00c251ae Merge branch '_RHH/master' into _RHH/upcoming 2024-10-08 14:52:12 -03:00
Eduardo Quezada
541ca2619b Start 1.9.4 cycle 2024-10-08 14:47:32 -03:00
Eduardo Quezada
a76f7fe92e
Version 1.9.3 (#5485)
* Version 1.9.3

* Updated to latest master
2024-10-08 14:45:09 -03:00
Pawkkie
efad9a32a9
Fix AI tests using PASSES_RANDOMLY (#5486) 2024-10-08 13:04:35 -04:00
psf
0dcb28ba0e
Add OW_UNION_DISABLE_CHECK and OW_FLAG_MOVE_UNION_ROOM_CHECK (#5448)
* First addition of both checks

* Updated config file

* fixed spacing

* Updated spacing

* Fixed issues where feature was always on

* Update overworld.h

fixed spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/5448#discussion_r1789647611
2024-10-07 17:07:23 +02:00
Eduardo Quezada
a7fca616b0 Merge branch '_RHH/master' into _RHH/upcoming 2024-10-04 14:28:13 -03:00
wiz1989
6f59d26753
updated Conversion 2 mechanics to 5+ (#5453)
* updated Conversion 2 mechanics and added the toggle B_UPDATED_CONVERSION_2

* fixes and added new test cases

* bugfixing and added EWRAM u16 gLastUsedMoveType

* update after Pawkkie review

---------

Co-authored-by: wiz1989 <wiz1989@LAPTOP-8Q3TPMGC.localdomain>
2024-10-04 12:42:15 -04:00
kittenchilly
19009c6d21
Add support for overworld sprite gender differences + add all the sprites (#5394) 2024-10-04 17:56:21 +02:00
Eduardo Quezada
0f8b2a1ba8 Merge branch '_RHH/master' into _RHH/pr/master/pretSync20240909 2024-10-04 10:23:58 -03:00
Alex
077bbd3442
Adds padding in AiLogicData (#5468)
* Adds padding in AiLogicData

* Update battle.h

* Update battle.h

* Update battle.h
2024-10-03 22:11:54 -04:00
Eduardo Quezada
80af2af9ad Merge branch '_RHH/master' into _RHH/upcoming 2024-10-03 14:33:01 -03:00
ghoulslash
be5f2e095e
fix duplicating flute glitch (#5436)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-10-03 13:01:18 +02:00
kittenchilly
44bf14e6fd
Add functionality to Poké Flute and Town Map (#5405)
* Add functionality to Poké Flute and Town Map

* Poke flute in-battle

* Address reviews

* Update item_use.c

* Update battle_message.c

* Update battle_script_commands.c

* Update battle_script_commands.c

* Update battle_script_commands.c

* Update battle_script_commands.c

* Update battle_script_commands.c

* Update battle_script_commands.c
2024-10-03 10:52:59 +02:00
psf
2597d8a35a
Updated species defines (#5075)
* First version of new defines

* Fixed cloaks

* Fixed cloaks

* Fixed cloaks

* Fixed cloaks

* Fixed cloaks

* Removed old defines

* Removed old defines

* Removed old defines and cleaned up some macros

* Undid changes to documentation
Deleted unused defines
Updated defines
Fixed tests
fixed docs

* moved note to top per https://github.com/rh-hideout/pokeemerald-expansion/pull/5075\#discussion_r1783641599

* fixed alignment per https://github.com/rh-hideout/pokeemerald-expansion/pull/5075\#pullrequestreview-2341613591
2024-10-02 18:24:57 -03:00
Pawkkie
ded97e5296
Switch AI refactor + considers free switches (#5379)
* Switch AI considers free switches from pivot move

* Fix Baton Pass refactor

* Some cleanup and comments

* Mon fainting to hazards is a 0HKO

* Revert "Mon fainting to hazards is a 0HKO"

This reverts commit 446f738226.

* Cleanup speed check / Eject Pack

* Move eject trackers to AiLogicData

* Review feedback and WhoStrikesFirst changes

* This linebreak will bug me lol

* Also this comment, heck

* Last bit of comment cleanup
2024-10-01 23:10:02 +02:00
Alex
b93e58266e
Fixes recoil moves not triggering berries if possible (#5449)
* Fixes recoil moves not triggering berries if possible

* Update battle_script_commands.h
2024-10-01 10:43:58 +02:00
psf
58aa1e0034
Merge branch 'upcoming' into scriptCommands 2024-09-30 06:57:54 -07:00
Bassoonian
5a8a393dcd
Add Sideways Stairs (#4836) 2024-09-30 00:06:25 +02:00
Alex
42c43a3f8f
Adds Commander and Order Up (#5246)
* Adds Commander

* review points

* new line

* correction

* regression / double targeting still broken

* fix wrong target order

* transform fixes

* haze test

* fixes, tests

* bring back wrongly removed else if case

* Eject Pack / Button test + fix

* red card fix

* test fixes

* Fixes Tatsu being hit by multi hit move

* change transform check

* fix test + revert change

* Fix Tatsugiri attacking after freed up from Dozo in the same turn

* Dragon Darts tests

* fix test

* review comments

* assumtion in wrong file

* Order Up test fixes

---------

Co-authored-by: hedara90 <90hedara@gmail.com>
2024-09-29 22:45:50 +02:00
ghoulslash
c8afe9bbde some formatting fixes 2024-09-29 13:34:11 -04:00
ghoulslash
be3ee1ba85 merge w upcoming 2024-09-29 13:33:20 -04:00
Pawkkie
5e027754c7
Add ShouldSwitch result to AiLogicData (#5440)
* Add ShouldSwitch to AiLogicData

* Convert shouldSwitch to bitfield

* Update include/battle.h

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

* Update include/battle.h

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-29 12:16:33 -04:00
Eduardo Quezada
5130ea9da3 Merge branch '_RHH/master' into _RHH/upcoming 2024-09-28 11:45:49 -03:00
Bassoonian
7dad83070f
Added MB_X_Y_STAIR_WARP metatile behaviors (#5278) 2024-09-28 15:21:11 +02:00
pkmnsnfrn
6cea365135 Merge branch 'upcoming' into stairWarps 2024-09-27 17:25:57 -07:00
kittenchilly
c1dffc694e
Merge level_caps and ev_caps into one caps file (#5429)
* Merge level_caps and ev_caps into one caps file

* Update caps.h
2024-09-27 23:40:49 +02:00
PhallenTree
e67d5a23ed
Adds some Snatch interactions, fixes for Dragon Darts, Trace, Primal Reversion, Protosynthesis/Quark Drive (#5430)
* Fixes Electrified Dragon Darts sometimes targeting battlers with absorbing abilities (Volt Absorb, Motor Drive)

* Add Snatch interactions with Dancer, Swallow

* Trace fix + cleanup

* Simplify Quash

* Fixes multiple mons with Primal Reversion causing only one Primal Reversion, add tests

* Fix Booster Energy Ability Popup

* Accidentally removed healing from Swallow

* More Trace cleanup
2024-09-24 18:40:44 +02:00
psf
ad0778722b
Adds SAVE_TYPE_ERROR_SCREEN (#5188)
* Original commit

* Moved config from save to general https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#discussion_r1720747901
Reindent function per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#discussion_r1720747984
Split Compound String into seperate lines
per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#discussion_r1720748104
Changed Rom to ROM per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#discussion_r1720748104
Removed extra new line per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#discussion_r1720748172

* fixed spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#issuecomment-2295134679

* Updated spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#issuecomment-2306527812

* Removed comment and made line breaks consistent per https://github.com/rh-hideout/pokeemerald-expansion/pull/5188\#pullrequestreview-2320266015
2024-09-22 19:07:17 +02:00
psf
009b42394e
Merge branch 'upcoming' into stairWarps 2024-09-22 09:40:34 -07:00
ghoulslash
b7246a018c merge w upcoming 2024-09-22 09:13:25 -04:00
Frank DeBlasio
1ba0875654
Removed FRONTIER_BRAIN_SPRITES and updated TRAINER_SPRITE, TRAINER_BACK_SPRITE, and TRAINER_CLASS (#5166)
* Removed FRONTIER_BRAIN_SPRITES

* Updated TRAINER_SPRITE and TRAINER_BACK_SPRITE

* Updated TRAINER_CLASS macro

* Removed FRONTIER_BRAIN_TEXTS

* Turned Frontier Brain text to COMPOUND_STRINGs

* Removed frontier_brain.inc from event_scripts.s

* Addressed front sprite comment

* Addressed backsprite comments
2024-09-22 09:54:01 +02:00
Frank DeBlasio
d1bb7770d3
Converted berry and PokeBlock strings to COMPOUND_STRINGs (#5324)
* Converted bag pocket names to COMPOUND_STRINGs

* Converted berry-related text to COMPOUND_STRINGs

* Converted PokeBlock-related text to COMPOUND_STRINGs

* Added indexes to BerryFirmnessStrings

* Updated call to sBerryFirmnessStrings

* Changed gText to sText
2024-09-21 20:44:25 +02:00
Bassoonian
8ba96fdac4
Add OW_AUTO_SIGNPOST and associated metatile behaviors (#5044) 2024-09-21 20:39:07 +02:00
psf
fee26e29f5
Add AUTO_SCROLL_TEXT and NUM_FRAMES_AUTO_SCROLL_DELAY (#5054)
* Added AUTO_SCROLL_TEXT

* Moved NUM_FRAMES_AUTO_SCROLL_DELAY

* Moved NUM_FRAMES_AUTO_SCROLL_DELAY per https://github.com/rh-hideout/pokeemerald-expansion/pull/5054/files#r1698268265

* Apply suggestions from https://github.com/rh-hideout/pokeemerald-expansion/pull/5054/files#r1698268524

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

* Added ability to skip text with button press per https://github.com/rh-hideout/pokeemerald-expansion/pull/5054\#issuecomment-2267100771

* Update gflib/text.h per https://github.com/rh-hideout/pokeemerald-expansion/pull/5054#issuecomment-2274402891

* Update text.h

* Fixed alignment per https://github.com/rh-hideout/pokeemerald-expansion/pull/5054/files\#r1711780606

* Moved NUM_FRAMES_AUTO_SCROLL_DELAY

* Update gflib/text.c

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

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-09-19 12:01:12 +02:00
Alex
71dfd3e7c0
Ogerpon masks were missing their hold effects (#5391)
* Ogerpon masks were missing their hold effects

* fix wrong num

* test

* correct tests and additional fix

* added hold effect to battle debug
2024-09-19 00:25:53 +02:00
PhallenTree
76656e85c2
Fix Quash implementation, adds After You and Quash missing configs + tests (#5400)
* Fix Quash + After You and Quash configs

* Add tests
2024-09-19 00:10:29 +02:00
nescioquid
ac2b41ae71
Typo fixes and Growth move description change (#5398)
* changes Growth's move description to account for Gen 5+ behavior

* completes B_DIVE_BALL_MODIFIER comment

* fixes typos and incongruent spacing in various files

* Update src/data/moves_info.h

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

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-09-18 23:03:36 +02:00
Alex
6ef36837e9
Fixed corruption of the next turn used move caused by Scale Shot (#5397) 2024-09-18 16:58:49 +02:00
Kurausukun
52c2728ff6 remove gflib 2024-09-18 10:37:34 -04:00
Eduardo Quezada
6116b8b04e Start 1.9.3 cycle 2024-09-16 11:57:41 -03:00
Eduardo Quezada
889a02d263
Version 1.9.2 (#5357)
* Version 1.9.2

* Apply suggestions from code review

Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>

* Updated to latest master

* Updated to latest master

* Fix last PR

* Corrected order + Pumpkaboo/Gourgeist credits

---------

Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2024-09-16 12:12:34 -03:00
Bassoonian
0b429a8649
Merrp merge (September 9th) (#5359) 2024-09-15 13:21:39 +02:00
Alex
25e9ca2ac6
Cleaned up a bit of code with GetBattlerPartyData (#5378)
* rename GetBattlerPartyData
2024-09-15 08:24:26 +02:00
Sadfish the Sad
f6319d8446
new animations for many moves more details in description (#5367)
New: Me First, Zippy Zap, Splishy Splash, Floaty Fall, Pika Papow, Bouncy Bubble, Buzzy Buzz, Sizzly Slide, Glitzy Glow, Baddy Bad, Sappy Seed, Freezy Frost, Sparkly Swirl, Veevee Volley, Snap Trap, Astral Barrage, Burning Bulwark
Updated: Aura Sphere, Dark Void, Spirit Shackle
Fixed: Springtide Storm, Bleakwind Storm, Wildbolt Storm, Sandsear Storm, Clangorous Soul(Blaze)
2024-09-15 08:22:40 +02:00
Alex
0d7c193e4c
fixes Micle Berry not increasing accuracy on the next turn (#5358)
* fixes Micle Berry not increasing accuracy on the next turn

* adds bitfield instead of using protect struct

* test from pawkkie

* ndebug

* renaming

* delete redundant comment

* typo

* micle berry more detailed descriptions
2024-09-14 19:55:03 -04:00
DizzyEggg
c4b5818d98
remove ScriptContext_Enable from secret_base.h 2024-09-14 19:13:02 +02:00
pkmnsnfrn
60fb0b34fd Modified getobjectxy to allow for custom destinations 2024-09-14 07:48:24 -07:00
Pawkkie
79776bf6bb
ShouldSwitchIfWonderGuard tests and cleanup (#5383) 2024-09-14 10:45:26 +02:00
PhallenTree
100c7dd8ad
Fixes Powder (status) interactions + tests (#5370)
* Simplified fix from #4638

* Fixes interactions with Z-Moves, Magic Guard, Heavy Rain, Pledge

* Powder Tests

* Remove duplicate

* Assume Powder is a powder move

* Add config for Powder Rain interaction

* Only primal rain

* Z-Moves fix handled in Canceller_Z_Moves

* Fix BattleScript name

* Make sure Z-Move + Powder still damages user
2024-09-13 18:08:23 +02:00
hedara90
9633cefd11
Custom anim table follower macro & Farfetch'd example (#5309)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-09-13 10:30:01 -03:00
pkmnsnfrn
510af1bee6 Restored original functions and made script versions 2024-09-12 20:55:37 -07:00
psf
1ba8e7d300
Merge branch 'upcoming' into signpost 2024-09-12 14:45:37 -07:00
psf
51a69b6a9d
Merge branch 'upcoming' into stairWarps 2024-09-12 14:43:46 -07:00
Liamjd14
5d8c61d813
Pokemon follower changes for issue #5135 (#5336) 2024-09-12 18:55:30 +02:00
pkmnsnfrn
a0e914b749 Merge branch 'upcoming' into scriptCommands 2024-09-12 05:39:24 -07:00
Eduardo Quezada
831b394ca1 Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909
# Conflicts:
#	Makefile
#	include/battle.h
#	include/battle_main.h
#	include/battle_util.h
#	include/data.h
#	make_tools.mk
#	map_data_rules.mk
#	src/battle_setup.c
#	src/fieldmap.c
2024-09-11 15:26:14 -03:00
Pawkkie
047289a639
Improve AI's Skill Swap handling in double battles (#5360)
* Improve AI contrary

* Update src/battle_ai_util.c

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

* Fix additionalEffects loop

* moves[i] to aiMove

* Update src/battle_ai_util.c

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

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-11 00:00:29 +02:00
Rachel
b478881fc6
Add in-battle shadows underneath all enemy battlers (#5178)
* Add data to SpeciesInfo entries for in-battle shadows

* Implement sized shadows in the sprite visualizer

* Implement sized shadows in game code

* Show shadows for the lead battler for opponents during their battle anim

* Feedback on shadows, round 1

* Revert removal of Goomy and Sliggoo shadows

* Fixed GEN_3 setting

* Code cleanup + remove pre-processor branches

* Fix bugs with gen-3 configuration branch

* Style corrections, final shadow coordinate adjustments

* Adjustments to Garbodor and Araquanid
2024-09-10 21:27:49 +02:00
psf
2477f1d5ca
Made BuildColorMaps redundant by using static tables (#5289)
* Added config for ColorMaps

* Fixed delclartion of static maps

* First commit complete

* Removed config

* Removed config

* fixed overworld config per https://github.com/rh-hideout/pokeemerald-expansion/pull/5289\#discussion_r1747583812

* Fixed pointer alignment per https://github.com/rh-hideout/pokeemerald-expansion/pull/5289\#pullrequestreview-2286973040

* Update overworld.h

Removed new lines per https://github.com/rh-hideout/pokeemerald-expansion/pull/5289/files#r1749325673
2024-09-10 14:44:08 +02:00
Eduardo Quezada
002c770f07 Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/master/merrpMerge 2024-09-09 13:52:34 -03:00
Alex
3cfc0004b6
Removes redundant moveTargetType ai function (#5354)
* Removes redundant moveTargetType ai function

* Beautify GetBattlerMoveTargetType for better readability
2024-09-09 11:30:39 -04:00
Eduardo Quezada
6d020eb366
Cleaned up duplicate dynamic type functions (#5338)
* Cleaned up duplicated dynamic type functions

* Small cleanup

* Oops, last cleanup broke stuff

* Alignment

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

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-08 19:14:05 +02:00
SonikkuA-DatH
8c3531ffc7
Grass/Water Pledge Swamp Animation + Sea of Fire animation tweak (#5325) 2024-09-07 18:04:47 +02:00
Alex
5c86aa126f
Revert rtc based encounters (#5331)
* Revert "RTC-based wild encounters follow up (#5328)"

This reverts commit 9a95c9b07a.

* Revert "RTC-based wild encounters (#5313)"

This reverts commit 7c7fd905ba.
2024-09-06 21:09:04 +02:00
psf
0e1b62c732
Merge branch 'upcoming' into signpost 2024-09-05 17:11:32 -07:00
psf
1143da0c1c
Merge branch 'upcoming' into stairWarps 2024-09-05 17:09:45 -07:00
Frank DeBlasio
d3a3565fef
Converted PC strings to COMPOUND_STRINGs (#5314)
* Converted PC strings to COMPOUND_STRINGs

* Update src/pokemon_storage_system.c

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

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-09-04 16:43:34 -04:00
Frank DeBlasio
3aa24f527e
Converted Mechadoll text to COMPOUND_STRINGs (#5276) 2024-09-04 14:56:19 -04:00
cawtds
6e3ce9db2f
Move battle anim arrays to C (#5306)
* move battle anim arrays to c

* use ARRAY_COUNT instead

* remove B_ANIM_STATUS_WRAPPED

* move anim rename

* rename battle anims status/general/special
2024-09-04 11:21:40 +02:00
Pawkkie
720bc6464d
AI_FLAG_SETUP_FIRST_TURN Rename and Clarifications (#5310)
* Rename AI_FLAG_SETUP_FIRST_TURN

* Update all AI flags with comments
2024-09-04 11:12:55 +02:00
Hiram Anderson
7c7fd905ba
RTC-based wild encounters (#5313)
* Some jsonproc string utility functions

Adds stringContains, stringStartsWith and stringEndsWith for use in jsonproc.

* Time-based wild encounters

This adds some configs that allows users to define wild encounter groups on a map that are automatically cycled through depending on the time of day.
2024-09-03 21:54:03 +02:00
Eduardo Quezada
8533b0c045 Merge branch '_RHH/master' into _RHH/upcoming 2024-09-03 14:39:50 -04:00
ghoulslash
28a9ad3399
(Default Off) Item Description Headers (#4767)
* add item descption headers and (default-off) config

* revert test script

* OW_SHOW_ITEM_DESCRIPTIONS can be 0(off), 1(first time) or 2(always), move code to overworld.c to prevent issues with users whove merged original branch. fix styling

* add ow item header config value labels

* Update include/config/overworld.h

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

* Update src/overworld.c

* Update include/overworld.h

* ScriptShowItemDescription remove unused var

* fix ScriptShowItemDescription warning

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-03 20:22:01 +02:00
Alex
04b5c013a9
Adds config to show target of ingame partner (#5307)
* Adds config to show chosen move and target of ingame partner, `#define B_SHOW_PARTNER_TARGET`, default `FALSE`
---------

Co-authored-by: Hedara <hedara90@gmail.com>
2024-09-03 19:28:59 +02:00
SarnPoke
a422db09c6
Fix Slateport Battle Tent/Battle Factory (#5281)
* Fix Slateport Battle Tent/Battle Factory

Stops the Battle Factory and Slateport Battle Tent from returning no Pokémon when player wants to swap their Pokémon.

* Fix player rental party being junk data after rest

Fixes #5280

* Consolidate checks into single method

Consolidates every gSpecialVar_0x8005 check into a singular method.
2024-09-02 16:53:03 -04:00
Ariel A
42d9f24c84 feat: added OW_MON_WANDER_WALK config option 2024-09-01 17:17:24 -04:00
Erickson Russell
de242c8a29
EV Caps and EV Items (#5269)
* EV Caps and EV Items

Introduces EV caps, inspired by level caps, with configurable options for various cap implementations. Additionally, modifies EV items to interact with these caps based on a configurable setting.

* EV Caps fixes

Changed the EV caps to be less redundant and work better overall.

* EV Caps Fix part 2

Set the items back to ItemUseOutOfBattle_Medicine, got rid of ItemUseOutOfBattle_EVItem and ItemUseCB_EVItem, and reverted CB2_ReturnToPartyMenuUsingItem to CB2_ReturnToPartyMenuUsingRareCandy

* EV Caps Fixes Part 3

Fixed being able to use EV items to go over 252 limit on single stats.

* Update src/ev_caps.c

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

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-01 23:15:39 +02:00
Ariel A
839cf2e790 feat: static OW pokemon now bob while walking in place (per OW_MON_BOBBING) 2024-09-01 15:31:12 -04:00