Eduardo Quezada
57fc0fd3b9
Merge branch '_RHH/master' into _RHH/upcoming
2024-08-01 08:36:11 -04:00
Alex
de8002e9e0
Removes unnecessary checks for Shield Dust and Covert Cloak ( #5073 )
...
* Removes unnecessary checks for Shield Dust and Covert Cloak
* remove redundant include
* Update test/battle/ability/shield_dust.c
Co-authored-by: hedara90 <90hedara@gmail.com>
* Update test/battle/hold_effect/covert_cloak.c
Co-authored-by: hedara90 <90hedara@gmail.com>
---------
Co-authored-by: hedara90 <90hedara@gmail.com>
2024-08-01 09:58:14 +02:00
Eduardo Quezada
8450268b74
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/data/battle_anim.h
2024-07-31 18:13:19 -04:00
Alex
3b9ea5b54c
Adds battle frontier conversion script ( #5040 )
...
Adds script to convert battle frontier mons to new format
Fixes existing battle frontier mons to match vanilla
2024-07-31 15:04:21 -07:00
tertu
05ff7cef1c
Tweak IV generation slightly ( #4876 )
...
With HQ_RANDOM on, this means that the generator now only consumes one RNG output when generating IVs.
Without HQ_RANDOM on, IV generation should be unchanged.
2024-07-31 19:51:47 +02:00
Alex
e6175b5b84
Fixes spread damage in double battles ( #5064 )
...
* Fixes spread move damage in doubles
* add DoubleBattle check
* add additional check to test
* restore trainer party
2024-07-31 12:20:57 +02:00
PhallenTree
ab9f8e69fb
Fixes Stalwart/Propeller Tail, Life Orb on confusion, Remove Status wrong battlescripts ( #5061 )
...
* Fix swapped BattleScripts in MoveEffectRemoveStatus for Freeze/Frostbite
* Fix Life Orb damaging the user if they hit themselves in confusion
* Fix Stalwart/Propeller Tail not ignoring redirection from Storm Drain/Lightning Rod
* Parametrize Species
2024-07-30 10:36:22 +02:00
hedara90
74220518d4
Fixed the animation tables being different sizes ( #5063 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-29 13:34:19 -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
54c19af037
Fixed B_HEAL_BELL_SOUNDPROOF checking for Gen9+ instead of Gen8+ ( #5060 )
2024-07-29 16:28:32 +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
kittenchilly
904d59220d
Shorten squish anim
2024-07-28 11:55:57 -05:00
kittenchilly
f22666c2a3
Merge branch 'master' into axekick-anim
2024-07-28 11:46:14 -05:00
pkmnsnfrn
1ac4d195c2
Changed mb to MetatileBehavior per https://github.com/rh-hideout/pokeemerald-expansion/pull/5044\#discussion_r1694003941
2024-07-27 15:17:32 -07:00
pkmnsnfrn
5bb1730394
Fixed if statement compilation
2024-07-27 15:07:50 -07:00
pkmnsnfrn
4f03ba98be
Removed extra newline per https://github.com/rh-hideout/pokeemerald-expansion/pull/5044/files\#r1694004015
2024-07-27 15:05:49 -07:00
pkmnsnfrn
fccecf038f
Removed extra newline per https://github.com/rh-hideout/pokeemerald-expansion/pull/5044/files\#r1694003876
2024-07-27 15:03:45 -07:00
pkmnsnfrn
3c4aaf53f8
Removed unneeded preproc per https://github.com/rh-hideout/pokeemerald-expansion/pull/5044/files\#r1694003941
2024-07-27 15:03:03 -07:00
pkmnsnfrn
e360d3bd73
Removed extra newline per https://github.com/rh-hideout/pokeemerald-expansion/pull/5044/files\#r1694003683
2024-07-27 15:02:15 -07:00
pkmnsnfrn
b666782483
Nested conditions per https://github.com/rh-hideout/pokeemerald-expansion/pull/5044/files\#r1694003628
2024-07-27 15:01:33 -07:00
pkmnsnfrn
d21d23b52c
Removed extra spaces per https://github.com/rh-hideout/pokeemerald-expansion/pull/5044/files\#r1694003572
2024-07-27 14:59:36 -07: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
pkmnsnfrn
1ad3ba1f32
Fixed compilations errors with abgcc
2024-07-27 10:58:51 -07:00
pkmnsnfrn
31fc49734a
Removed preproc from src/metatile_behavior.c per https://github.com/rh-hideout/pokeemerald-expansion/pull/5044\#discussion_r1693914236
2024-07-27 07:34:33 -07:00
Bassoonian
c603e11310
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge27july
2024-07-27 12:01:39 +02:00
Martin Griffin
30f8ccfe6e
Merge pull request #2017 from PokemonSanFran/numSnowflakeSpritesConstant
...
Added constant for NUM_SNOWFLAKE_SPRITES
2024-07-27 07:26:40 +01:00
pkmnsnfrn
91b48a10d4
Added constant for NUM_SNOWFLAKE_SPRITES
2024-07-26 21:57:42 -07:00
pkmnsnfrn
587ffeeb97
Fixed tabs
2024-07-26 21:31:04 -07:00
DizzyEggg
e82e3b4198
Allow flags in trigger scripts ( #4900 )
2024-07-26 23:46:33 +02:00
Pawkkie
3c1fbbb06e
Fixes cantBeSurpressed ability check for breakable abilities ( #5043 )
2024-07-26 15:57:01 -04:00
AlexOn1ine
5dd10a4af1
forgot abilityShield check
2024-07-26 21:34:20 +02:00
AlexOn1ine
dfd63fd34f
func CanBreakThroughAbility
2024-07-26 21:30:41 +02:00
AlexOn1ine
89563cb9b1
check for breakable ability
2024-07-26 21:11:16 +02:00
AlexOn1ine
8b2774e07d
Fixes cantBeSurpressed ability check for breakable abilities
2024-07-26 20:19:58 +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
Eduardo Quezada
cc00446eb8
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/data/graphics/pokemon.h
# src/data/pokemon/species_info/gen_9_families.h
2024-07-26 09:42:52 -04:00
pkmnsnfrn
f362f6e754
Cleaned up metatile behavior
2024-07-25 21:22:08 -07:00
pkmnsnfrn
02cdbb3c7d
Cleaned up field_control_avatar
2024-07-25 21:07:11 -07:00
pkmnsnfrn
7717812154
Clean up files
2024-07-25 20:34:14 -07:00
pkmnsnfrn
2a5f384e66
Added metatile behaviors to mart and center signs
2024-07-25 19:44:26 -07:00
pkmnsnfrn
b5c58e53de
Removed all comments
2024-07-25 19:35:28 -07:00
pkmnsnfrn
fd69ef339c
Got pokemart and pokecenter changes working
2024-07-25 19:33:07 -07:00
kittenchilly
a16448c081
Update and clean up Battle Debug ( #4643 )
...
* Update battle debug with new stuff
* Fix status not showing up
* Update hold effects as well
* Update battle_debug.c
* Update battle_debug.c
2024-07-26 00:07:11 +02:00
kittenchilly
b4792d3f7e
Add Axe Kick animation
2024-07-25 14:06:02 -05:00
psf
c69107a14a
Fix fishing minigame ( #5031 )
...
Fixed issue from #4343 where `GEN_3` minigame was not correctly working.
2024-07-25 08:37:02 -07:00
Pawkkie
062856cc6c
Add Memento to Risky AI flag ( #5032 )
2024-07-25 13:57:42 +02:00
pkmnsnfrn
614b7f862e
Working version of interactable signpost msgbox
2024-07-24 22:21:00 -07:00
