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

6400 commits

Author SHA1 Message Date
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
Liamjd14
5d8c61d813
Pokemon follower changes for issue #5135 (#5336) 2024-09-12 18:55:30 +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
cawtds
8af35a7e0d
add Sirfetch'd alias for competitive format (#5283) 2024-08-29 08:11:21 -04:00
Alex
98dbf3a575
Fixes Charged up status (#5274) 
Charge changed to last until the damage boost is consumed instead of next turn, previous behavior accessible with `B_CHARGE`
 2024-08-27 20:01:51 +02:00
PhallenTree
930cac6aca
Fix Instruct bypassing AtkCanceler, Entry Hazards targeting wrong side of the field if opponent fainted (#5262) 
* Fix Instruct bypassing AtkCanceler + interaction with firstTurnOnly moves

* Fix Entry Hazards targeting the wrong side of the field if opponent fainted

* Remove unused BattleScript_AuroraVeilEnds and STRINGID_AURORAVEILENDS

* Alternative fix + Fix gBattlerTarget initially set to 2

* Fix Instruct animation

* Alternative anim fix
 2024-08-27 14:46:56 +02:00
Eduardo Quezada
c075d8e6b1
Fixed test system documentation (#5266) 2024-08-26 21:59:01 +02:00
Salem
ceec17ec7b
remove unused bs signature (#5257) 2024-08-25 23:13:40 +02:00
hedara90
51a127fcb5
Better implementation of the obedience fix (#5245) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-08-25 11:20:26 +02:00
Eduardo Quezada
becb2fcac8 Start 1.9.2 cycle 2024-08-19 18:29:48 -04:00
Eduardo Quezada
a11f03ed9d
Version 1.9.1 (#5199) 
* Version 1.9.1

* Added 5195

* Apply suggestions from code review

Co-authored-by: hedara90 <90hedara@gmail.com>

* Added 5196 and 5207

---------

Co-authored-by: hedara90 <90hedara@gmail.com>
 2024-08-19 18:25:39 -04:00
PhallenTree
ec3a86dd9a
Adds in-battle effect of Pickup, adds Harvest and Pickup tests (#5170) 
* Adds Harvest tests

* Adds Pickup in-battle effect + tests

* Fix G-Max Replenish test (Munchlax activates Pickup before G-Max Replenish)

* Change canPickupItem to bit field

* Make RandomUniformExcept inclusive (higher end) + convert bitfield

* Use CantPickupItem in PickupHasValidTargetc check

* Review
 2024-08-16 15:37:23 +02:00
hedara90
47356d181a
Fixed followers breaking for species IDs above 1535 (#5179) 
* Fixed followers breaking for species Ids above 1535

* Added reminder to increase follower species bits if needed in the future

---------

Co-authored-by: Hedara <hedara90@gmail.com>
 2024-08-15 10:27:35 -07:00
hedara90
45f10d734f
Fixed Ice Face, implemented tests (#5171) 
* Fixed Ice Face, implemented tests

* Fixed agbcc and bad battle mon looping

* Fixed the ShouldChangeFormInWeather function again

* Cleaned up End of Turn weather form changes, simplified Ice Face

---------

Co-authored-by: Hedara <hedara90@gmail.com>
 2024-08-15 13:51:39 +02:00
Eduardo Quezada
18980b20a3
Remove trailing whitespace (master) (#5174) 2024-08-14 19:48:20 -07:00
Sadfish the Sad
fde85e9357
some gen 9 move anims + fickle beam rework (#5159) 
* new move anims + fickle beam rework

* more fickle beam changes

* removed the true for consistency

* ficklebeamboosted gets cleared now

* mortal spin and thunderclap changes

* minor mortal spin pal change

* removed hex numbers and made hard press quicker
 2024-08-14 17:20:18 +02:00
Alex
7119d60a67
Set new anim particles by default to off (#5161) 2024-08-14 06:31:26 -07:00
Bassoonian
63a1f85d81 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge14aug 2024-08-14 12:33:04 +02:00
GriffinR
a3d5f54b75 Fix type for offset in MapConnection 2024-08-13 19:10:24 +02:00
cawtds
ba1512f864
Fix specific tiles changing to pc tiles when using boxlink/debug pc (#5141) 2024-08-12 15:52:55 -04:00
Alex
805bb2888c
Fixes wrong padding in struct SpeciesInfo (#5139) 
Fixes wrong padding in struct SpeciesInfo that is if I counted correctly.

After I opened #5138 I realized it might be an issue on master as well.
 2024-08-11 18:27:22 +02:00
Bassoonian
c390999141
Pret Merge (7th of August) (#5116) 2024-08-08 10:23:14 +02:00
psf
b8dab587ab
Update include/battle.h 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-08-07 14:32:36 -07:00
pkmnsnfrn
5fbe5a331c Updated spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/5114\#discussion_r1707607637 2024-08-07 13:33:35 -07:00
Bassoonian
0b1f06b594
Merrp merge (7th of August) (#5110) 2024-08-07 22:05:07 +02:00
pkmnsnfrn
5635f94036 More changes from typeX to types[X] 2024-08-07 11:35:45 -07:00
Bassoonian
cb4e687917 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmergeforpsf 2024-08-07 19:05:46 +02:00
Pawkkie
9f845a79e5
Fix Switch AI Bug: AI never switching out when it could be OHKO'd (#5089) 
* Fix switch AI bug

* Forgot to save a file lol

* Fix infinite loop test compatibility
 2024-08-07 15:58:39 +02:00
Bassoonian
207129e0c8 Merge branch 'followers-expanded-id' of https://github.com/aarant/pokeemerald into pretmerge7aug 2024-08-07 12:42:45 +02:00
psf
312749dd31
Changed type1 and type2 to be consistent (#2021) 
* Changed type1 and type2 in gBattleMons to match gSpeciesInfo
* Changed monType1 and monType2 to monTypes to match gSpeciesInfo
 2024-08-07 06:44:03 +01:00
kittenchilly
e4f09c8103
Move Relearner now displays move category (#5081) 
* Move relearner now displays move category

* Update move_relearner.c

* Update move_relearner.c

* Address reviews
 2024-08-06 23:58:18 +02:00
pkmnsnfrn
0fb48e8a9a Fixed expanded OW IDs 2024-08-03 17:04:33 -07:00
Martin Griffin
9d97537ee2
Fix speed ties (#4780) 
* Fix speed ties

* fixup! Fix speed ties

* fixup! Fix speed ties

* fixup! fixup! Fix speed ties

* fixup! Fix speed ties

* Workaround for Comatose-Ditto interaction
 2024-08-03 17:29:47 +02:00
Eduardo Quezada
512c44b698 Start 1.9.1 cycle 2024-08-01 17:04:48 -04:00
Eduardo Quezada
7ec24b89c8 Merge branch '_RHH/upcoming' into _RHH/pr/master/1.9.0 2024-08-01 16:58:19 -04:00
Eduardo Quezada
f95322628d Merge branch '_RHH/upcoming' into _RHH/pr/master/1.9.0 2024-08-01 16:47:50 -04:00
Eduardo Quezada
483121dfc0
Version 1.8.6 (#5005) 2024-08-01 19:52:29 -04:00
Eduardo Quezada
3372503430
Added OBJ_EVENT_GFX_SPECIES_SHINY macro (#5049) 
* Added OBJ_EVENT_GFX_SPECIES_SHINY

* Update src/event_object_movement.c

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

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-07-29 18:41:03 +02:00
Eduardo Quezada
b4eca0a6ec Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	data/battle_anim_scripts.s
#	src/battle_util.c
 2024-07-29 09:36:16 -04:00
hedara90
a89820fa96
Fixed Hidden Power damage category for PSS < GEN_4 (#5053) 
* Fixed Hidden Power damage category for PSS < GEN_4

* Fixed category display regression

* Wrapped GET_MOVE_TYPE

---------

Co-authored-by: Hedara <hedara90@gmail.com>
 2024-07-29 13:45:14 +02:00
Eduardo Quezada
18aff2db3b Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	asm/macros/battle_anim_script.inc
#	data/battle_anim_scripts.s
#	include/constants/battle_anim.h
#	src/battle_anim.c
#	src/data/battle_anim.h
 2024-07-27 16:26:37 -04:00
Eduardo Quezada
bb471746d6
Renamed EVO_DEFEAT_WITH_ITEM to EVO_DEFEAT_THREE_WITH_ITEM (#5046) 2024-07-27 21:41:05 +02:00
Eduardo Quezada
1e8773356c
Changed EVO_OVERWORLD_STEPS to use an EWRAM variable (#5047) 
* Changed EVO_OVERWORLD_STEPS to use an EWRAM variable

* Fixed PC swapping not resetting the follower steps
 2024-07-27 20:48:59 +02:00
Bassoonian
c603e11310 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge27july 2024-07-27 12:01:39 +02:00
pkmnsnfrn
91b48a10d4 Added constant for NUM_SNOWFLAKE_SPRITES 2024-07-26 21:57:42 -07:00
Pawkkie
3c1fbbb06e
Fixes cantBeSurpressed ability check for breakable abilities (#5043) 2024-07-26 15:57:01 -04:00
AlexOn1ine
89563cb9b1 check for breakable ability 2024-07-26 21:11:16 +02:00
hedara90
b0b63f66b9
Added Ivy Cudgel Animation (#5034) 
* Added Ivy Cudgel Anim, changed Ogerpon palettes, added jumpifmovetypeequals command

* Make the 20 year old compiler not complain

* Maybe better cudgel

* Moved animation

---------

Co-authored-by: Hedara <hedara90@gmail.com>
 2024-07-26 18:06:44 +02:00
Martin Griffin
5b251b614c trainerproc: Support Ogerpon 2024-07-25 14:50:32 +01:00