atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
16116 commits 2 branches 40 tags 617 MiB
Commit graph

6566 commits

Author SHA1 Message Date
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
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
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
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
Pawkkie
79776bf6bb
ShouldSwitchIfWonderGuard tests and cleanup (#5383) 2024-09-14 10:45:26 +02:00