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
kittenchilly
8d47db6160
Add Population Bomb animation ( #5194 )
...
* Population Bomb animation
* Update battle_anim_new.c
* Update battle_anim_new.c
2024-08-25 23:39:25 +02:00
Greenphx9
ad969c968c
Merge branch 'lighting' of https://github.com/aarant/pokeemerald into lighting-expansion-v2
2024-08-25 17:54:28 +10:00
Eduardo Quezada
abf60e9c64
Merge branch '_RHH/master' into _RHH/upcoming
2024-08-24 19:44:35 -04:00
Alex
5a320f94d2
Fixes Hyperspace Fury softlock ( #5237 )
...
Fixes #5236
2024-08-21 11:43:57 -04:00
Eduardo Quezada
6ac18a6fe5
Merge branch '_RHH/master' into _RHH/upcoming
2024-08-20 08:00:05 -04:00
Alex
bde6982890
Fixes weather abilities not activating when Cloud Nine user leaves th… ( #5209 )
...
* Fixes weather abilities not activating when Cloud Nine user leaves the field
* parametrize
2024-08-20 07:24:48 -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
Eduardo Quezada
fe275ef062
Teatime animations use B_WAIT_TIME_LONG ( #5173 )
2024-08-15 13:45:01 +02:00
Eduardo Quezada
18980b20a3
Remove trailing whitespace (master) ( #5174 )
2024-08-14 19:48:20 -07:00
pkmnsnfrn
dc06321054
Moved pokedex flags to constants files andadded constants to header of event_scripts
2024-08-14 19:24:55 -07:00
Eduardo Quezada
661ec0a9fd
Merge branch '_RHH/master' into _RHH/upcoming
2024-08-14 17:10:20 -04:00
Alex
4d78d5e507
Fixes Poltergeist missing accuracy check ( #5168 )
2024-08-14 12:07:01 -04: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
Bassoonian
5fefd743a2
Fix defines in MAP_NUM and MAP_GROUP
2024-08-14 13:02:40 +02:00
Ariel A
3abf4871fd
Merge branch 'followers-expanded-id' into lighting-expanded-id
2024-08-12 23:13:02 -04:00
pkmnsnfrn
f0d5b68f70
Improved checkspecies functions
2024-08-11 22:10:04 -07:00
pkmnsnfrn
abb17ea88b
Improved dex flags functions
2024-08-11 21:01:31 -07:00
pkmnsnfrn
7f5ecd8d0f
getobjectfacingdirection
2024-08-11 19:27:18 -07:00
pkmnsnfrn
262505589a
checkforspecies
2024-08-11 19:19:15 -07:00
pkmnsnfrn
e746334e1e
Added setmonball
2024-08-11 18:53:39 -07:00
pkmnsnfrn
fba1452c3b
Added Seen/CaughtMon macros
2024-08-11 18:49:42 -07:00
pkmnsnfrn
0784f9fa74
Added checkobjectat
2024-08-10 21:40:57 -07:00
pkmnsnfrn
811b5d286e
Added getobjectposition
2024-08-10 21:17:50 -07:00
Eduardo Quezada
113f8de9b1
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_controller_player.c
2024-08-08 13:22:49 -04:00
Eduardo Quezada
d88834dd58
Backported OBJ_EVENT_GFX_SPECIES macro from Expansion
2024-08-07 13:42:18 -04:00
PhallenTree
67f049fddb
Fixes Defiant interaction with Court Changed Sticky Web + Fickle Beam description ( #5093 )
...
* Fixes Court Changed Sticky Web deactivating Defiant/Competitive
* Fixes Fickle Beam's description
* Alternative fix
* Remove extra newLine
2024-08-06 10:45:30 +02:00
ghoulslash
80db140d2b
merge w pret
2024-08-04 12:32:13 -04:00
cawtds
3af93bdfee
FRLG+ whiteout message ( #4967 )
...
* FRLG whiteout message + post whiteout event
2024-08-02 08:28:05 -07: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
kittenchilly
904d59220d
Shorten squish anim
2024-07-28 11:55:57 -05:00
kittenchilly
9979fe01ac
Update battle_anim_scripts.s
2024-07-28 11:47:49 -05:00
kittenchilly
f22666c2a3
Merge branch 'master' into axekick-anim
2024-07-28 11:46:14 -05: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
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
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
pkmnsnfrn
bf11e0c27b
Revert metatile behavior
2024-07-25 20:23:04 -07:00
pkmnsnfrn
2a5f384e66
Added metatile behaviors to mart and center signs
2024-07-25 19:44:26 -07:00
kittenchilly
b4792d3f7e
Add Axe Kick animation
2024-07-25 14:06:02 -05:00
Eduardo Quezada
98eb4e5027
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# asm/macros/battle_script.inc
# include/constants/battle_string_ids.h
# src/battle_ai_switch_items.c
# src/battle_main.c
# src/battle_script_commands.c
# src/battle_util.c
# src/frontier_util.c
# test/battle/ai/ai.c
2024-07-19 09:20:05 -04:00
Alex
552e2768da
Fixes to Opportunist and Mirror Herb adjustments ( #4928 )
...
* Replace Opportunist todo tests with proper tests
* add failing test
* desc
* Fixes to Opportunist and Mirror Herb adjustments
* more tests
* some fixes
* first turn events switch
* simple enum + revert test desc
2024-07-19 11:01:46 +02:00
pkmnsnfrn
8445d44fb6
Renamed DoPicboxCancel to UseBlankMessageToCancelPokemonPic
2024-07-15 21:48:24 -07:00
pkmnsnfrn
28183ec299
first merge of ghoul's branch
2024-07-15 21:35:58 -07:00
Bassoonian
cfcac0b0f9
Clean up battle scripts ( #4839 )
...
* Clean up battle and anim scripts
* Revert anim cleanup
2024-07-15 16:25:25 +02:00
Bassoonian
367f6dc8fd
Address concerns
2024-07-13 18:01:54 +02:00
Alex
edc883d038
Refactors residual damage ( #4945 )
...
* Refactors damage non types
* correction
* Refactor weather damage script
* new line
* correction
* there was a hail test already
* ndebug
* add sandstorm test
* Update src/battle_script_commands.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-07-13 12:12:40 +02:00
Bassoonian
003bd54600
Rename battle terrain to environment
2024-07-13 12:02:18 +02:00
Eduardo Quezada
fb708b7ed3
Merge branch '_RHH/master' into _RHH/upcoming
2024-07-10 10:05:10 -04:00
hedara90
76d760041c
Flame Burst + Substitute fix ( #4939 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-10 13:58:32 +02:00
ghoulslash
bd014e4fb7
syntax, alignment fixes
2024-07-08 14:15:41 -04:00
