ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-28 04:34:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,013 Commits 1 Branch 0 Tags 235 MiB
64ffc5a85d
Commit Graph

616 Commits

Author SHA1 Message Date
ghoulslash
321634ed3b
Silk Trap Effect (#2512) 
* add silk trap effect, analog of obstruct

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-01-23 16:42:47 -03:00
Eduardo Quezada
749225ace1 Matching merge from upstream pret 
# Conflicts:
#	graphics/interface/menu_info.png
#	include/pokemon.h
#	src/battle_ai_switch_items.c
#	src/battle_anim_mons.c
#	src/battle_anim_water.c
#	src/battle_controller_opponent.c
#	src/battle_gfx_sfx_util.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
#	src/pokemon_summary_screen.c
 2023-01-20 12:31:54 -03:00
Eduardo Quezada
ac4825ad28 Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	src/battle_util.c
 2023-01-13 11:50:47 -03:00
LOuroboros
dccceb9689 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux 2023-01-09 14:59:41 -03:00
LOuroboros
620a6a5e90 Extra review changes 
-Foolproofed the ability checks in ABILITYEFFECT_ON_WEATHER and ABILITYEFFECT_ON_TERRAIN
-Made BattleScript_OverworldWeatherStarts and BattleScript_OverworldTerrain call the battle scripts that handle weather form changes, weather abilities, terrain seeds and terrain abilities.
-Consequentially, I removed the activation for weather and terrain abilities that I added to TryDoEventsBeforeFirstTurn, and the activation of Protosynthesis in ABILITYEFFECT_ON_SWITCHIN.
-Added a weatherAbilityDone to prevent abilities that lack self-checks like Protosynthesis from getting stuck in a loop.
-Removed now pointless ABILITYEFFECT_WEATHER_FORM. I think Duke/Sneed69 added it to fix Castform's form change, but it no longer serves a purpose.
 2023-01-09 14:22:14 -03:00
LOuroboros
f1ca254c28 Updated the Mimicry reimplementation 
Mimicry is now a proud member of ABILITYEFFECT_ON_TERRAIN.

Misc. changes:
-Ditched the dependency on and usage of gBattlerAttacker for the effects inside ABILITYEFFECT_ON_WEATHER and ABILITYEFFECT_ON_TERRAIN.
-Made Cmd_switchineffects activate ABILITYEFFECT_ON_TERRAIN to take into account overworld weather-induced field terrains.
-Updated the text strings printed by the battle scripts inside the aforementioned AbilityBattleEffects caseIDs.
-Removed constant label of unused VARIOUS_TRY_TO_APPLY_MIMICRY which I forgot about.
-Updated ChangeTypeBasedOnTerrain, partly as a result of the aforementioned changes but also for optimization purposes.
 -There was never a reason to establish an empty scope, or to use GET_MOVE_TYPE and the variables that complemented it.
-Removed case ABILITY_QUARK_DRIVE from AbilityBattleEffects' case ABILITYEFFECT_ON_SWITCHIN.
 2023-01-03 02:27:41 -03:00
LOuroboros
d0f5653f5e Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry 2023-01-02 19:00:41 -03:00
Eduardo Quezada
a23501a4a3 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	src/battle_script_commands.c
 2023-01-02 18:54:57 -03:00
LOuroboros
13d8c0d167 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities 2023-01-02 14:34:24 -03:00
Eduardo Quezada
16e8a5dd7f Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	include/battle_util.h
 2023-01-01 16:02:40 -03:00
LOuroboros
f2e63a2e41 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux 2022-12-31 03:33:42 -03:00
SphericalIce
200b71be02 Fix Beat Up's battle script to avoid an out-of-bounds array access 2022-12-27 10:49:57 +00:00
Martin Griffin
632ec92475 Minor Roost changes 
- Fix 'mon with Flying in type3 but not type1 or type2 is set to
  uninitialized roostTypes.
- Remove unread third roostTypes element.
- Option for Gen IV pure-Flying behavior.
 2022-12-21 14:52:01 +00:00
LOuroboros
6153b8e904 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities 2022-12-20 07:11:36 -03:00
LOuroboros
c8abf00cac Applied corrections 
Anger Shell:
 -Made it print a string from the gStatDownStringIds table while lowering Def and Sp. Def
 -Made it use the shiny new modifybattlerstatstage macro.
 -Made it activate multiple times per battle, as it should.
Well-Baked Body:
 -Turned it into an absorbing ability.
Wind Rider:
 -Turned it into an absorbing ability.
 -For its Tailwind interaction, I made it activate only when Tailwind kicks in successfully, instead of whenever it's active at the end of a turn.
Guard Dog:
 -Updated its check inside BattleScript_EffectHitEscape.
 -Moved it from Cmd_forcerandomswitch to BattleScript_EffectRoar.
Wind Power:
 -Split off its move end effect from Electromorphosis'.
Electromorphosis:
 -Split off its move end effect from Wind Power's.
Hadron Engine:
 -Merged its Switch In effect with Electric Surge's.
Protosynthesis:
 -Fixed its stat boost.
Quark Drive:
 -Fixed its stat boost.
Cud Chew:
 -Updated its ENDTURN effect's berry check.
Supreme Overlord:
 -Tweaked the looping i variable's data type, the order of the variables and the checks inside ApplySupremeOverlordModifier.
Earth Eater:
 -Turned it into an absorbing ability.

Misc changes:
-Added a variable to set the amount of stat stages raised inside AbilityMoveEffects' case ABILITYEFFECT_ABSORBING.
-Added a preproc config to update the text string that they print.
-Limited the scope of atkHighestStat and defHighestStat in CalcMoveBasePowerAfterModifiers to Protosynthesis's and Quark Drive's effects.
 2022-12-20 07:08:29 -03:00
Eduardo Quezada
1580f892a5 Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	include/constants/pokemon.h
#	src/battle_script_commands.c
 2022-12-19 18:53:26 -03:00
LOuroboros
852f06deea Updated SIDE constant usages 2022-12-15 17:44:56 -03:00
LOuroboros
a56cfd1aa7 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities 2022-12-12 19:55:48 -03:00
Eduardo Quezada
1290a9411d Reorganized SpecialStatus struct to minimize padding. 2022-12-12 00:37:00 -03:00
ghoulslash
340278c83b
Merge pull request #2452 from LOuroboros/intimidate 
Optimized Intimidate's code
 2022-12-11 22:04:16 -05:00
LOuroboros
0d1f9d9613 Reimplemented Mimicry 2022-12-09 20:46:18 -03:00
LOuroboros
f96137eb5e Implemented Cud Chew's effect 2022-12-06 05:23:30 -03:00
LOuroboros
acb9c31bd4 Implemented Anger Shell's effect 2022-12-03 01:19:24 -03:00
Eduardo Quezada
e858b4e709 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124 
# Conflicts:
#	include/battle.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_dome.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/battle_tower.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
 2022-11-24 15:36:00 -03:00
LOuroboros
31a602f3b6 Optimized Intimidate's code 2022-11-12 18:03:46 -03:00
Eduardo Quezada
8f289714b2 Moved form change defines and descriptions to their own header 2022-11-05 21:36:45 -03:00
Eduardo Quezada
ceb5c8a00a Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	include/battle_util.h
#	src/battle_util.c
 2022-11-05 20:11:33 -03:00
LOuroboros
86e322dcea Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux 2022-11-01 22:41:31 -03:00
Eduardo Quezada
797c5514d3 Mega Evolution in form change tables 2022-11-01 18:37:23 -03:00
BuffelSaft
224ca256ce Requested clean up 
Rename constants, remove white space, improve B_BEAT_UP description.

* Rename B_BEAT_UP_DMG to B_BEAT_UP
* Shorten B_PARENTAL_BOND_DAMAGE to B_PARENTAL_BOND_DMG
* Remove trailing whitespace
* Replace boolean 1 with TRUE in MOVEEND_MULTIHIT_MOVE
 2022-10-27 22:25:33 +13:00
BuffelSaft
1b056f9044 Fix various Parental Bond issues 
- Dragon Tail and Circle Throw strike twice and then switch the target
- Z moves are unaffected by Parental Bond
- Renamed parentalBondOn to parentalBondState
- Added constants for possible values of parentalBondState
- Fixed broken stat change animations and removed unused MOVE_EFFECT_SKY_DROP
 2022-10-23 17:37:23 +13:00
BuffelSaft
6035c5a280 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald into multistrike 2022-10-22 14:31:13 +13:00
Eduardo Quezada
0a79390ec0 Primal Reversion in Form Change tables 2022-10-21 02:08:37 -03:00
Eduardo Quezada D'Ottone
18e7fc5efc Introduce NUM_BATTLE_SIDES 2022-10-20 08:41:18 -03:00
GriffinR
60e1ad20e4 Add NUM_MON_PIC_FRAMES, and trainer pic size constants 2022-10-10 23:16:08 -04:00
ghoulslash
c22671d2a2 add overwrittenAbilities field 2022-09-24 12:12:31 -04:00
Eduardo Quezada D'Ottone
d59d8b92af
Merge branch 'dev' into AI 2022-09-24 11:07:09 -03:00
Eduardo Quezada
65108c3192 Cleaned trailing whitespace 2022-09-11 14:14:49 -04:00
LOuroboros
c8f4a44380 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux 2022-09-06 20:40:34 -03:00
Eduardo Quezada
dbd56efaef Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902 
# Conflicts:
#	src/battle_util.c
 2022-09-05 12:20:57 -04:00
Eduardo Quezada
41bf6bde25 Removed pointless macro 2022-09-03 00:28:53 -04:00
Eduardo Quezada
5403cd036e Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902 
# Conflicts:
#	include/battle.h
#	include/battle_controllers.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controllers.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
 2022-09-02 23:24:08 -04:00
DizzyEggg
7cb010d71e fix magic bounce conflicts and fix magic coat 2022-08-30 19:36:06 +02:00
ghoulslash
2cd01bd95d
Merge pull request #2239 from DizzyEggg/quash 
Quash
 2022-08-29 10:43:54 -04:00
Eduardo Quezada D'Ottone
bee36edd9c
Merge pull request #2173 from LOuroboros/yourAffection 
Implement affection-now-friendship mechanics
 2022-08-26 14:54:32 -04:00
DizzyEggg
6331931ba3 Fix Magic Coat targets 2022-08-26 15:01:51 +02:00
LOuroboros
8bd7103b9d Even more review corrections 2022-08-25 17:32:12 -03:00
DizzyEggg
91b76e2e4f quash pr clean up 2022-08-24 23:39:34 +02:00
DizzyEggg
06b4548603 Merge branch 'SonikkuA-DatH-Quashh' of https://github.com/SonikkuA-DatH/pokeemerald-expansion into quash 2022-08-24 23:35:42 +02:00
LOuroboros
b7ca63d151 Implemented Ice Face 
Thanks to Benício Gonçalves#3454 who provided a base to work with.
 2022-08-24 13:45:34 -03:00
Eduardo Quezada D'Ottone
21867a6061
Merge branch 'master' into AI 2022-08-24 01:07:35 -04:00
DizzyEggg
05ec8fb182 AI knows Party mons 2022-08-23 11:58:17 +02:00
Eduardo Quezada
afcc1178b2 Merge remote-tracking branch 'pret/master' into MergedBranchUltimate 
# Conflicts:
#	data/battle_ai_scripts.s
#	data/battle_scripts_1.s
#	include/battle_controllers.h
#	include/battle_script_commands.h
#	include/battle_util.h
#	include/constants/battle_script_commands.h
#	include/constants/global.h
#	include/decompress.h
#	src/battle_anim_effects_1.c
#	src/battle_anim_normal.c
#	src/battle_anim_poison.c
#	src/battle_anim_water.c
#	src/battle_arena.c
#	src/battle_controller_link_opponent.c
#	src/battle_controller_link_partner.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controller_player_partner.c
#	src/battle_controller_recorded_opponent.c
#	src/battle_controller_recorded_player.c
#	src/battle_controller_safari.c
#	src/battle_controller_wally.c
#	src/battle_gfx_sfx_util.c
#	src/battle_interface.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/berry.c
#	src/data/trainers.h
#	src/decompress.c
#	src/field_effect.c
#	src/hall_of_fame.c
#	src/overworld.c
#	src/pokeball.c
#	src/pokemon.c
#	src/pokemon_icon.c
#	src/pokemon_storage_system.c
#	src/scrcmd.c
 2022-08-22 20:30:45 -04:00
DizzyEggg
327782646b Save party mons ai 2022-08-23 01:07:25 +02:00
Eduardo Quezada
3bc2cf921c Sync src/battle_controllers.c with pokefirered 2022-08-18 14:30:22 -04:00
Eduardo Quezada
59f89bde9e Misc cleanup 2022-08-18 14:23:45 -04:00
Eduardo Quezada
13672680b0 void pointer standarized 2022-07-29 10:52:35 -04:00
Eduardo Quezada
7b3401ee27 Standarized use of star in pointer types 2022-07-29 10:17:58 -04:00
LOuroboros
032b7b2ab9 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into yourAffection 2022-07-25 10:24:19 -03:00
Eduardo Quezada
f3bebcd12c Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge 
# Conflicts:
#	include/battle_anim.h
#	include/global.h
#	include/pokemon.h
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/data/pokemon/base_stats.h
 2022-07-22 22:57:02 -04:00
ghoulslash
99424e1aaf
Update include/battle.h 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-07-19 19:03:05 -04:00
ghoulslash
2b5bb9f6e4 move gSwapDamagecategory to battle struct, use GetSplitBasedOnStats for photon geyser check 2022-07-19 18:24:53 -04:00
ghoulslash
6b84a9f0b3 merge w be 2022-07-17 12:40:43 -04:00
ghoulslash
e4bf99d777 merge w be 2022-07-03 16:20:05 -04:00
LOuroboros
aa5c6a3f01 Implemented affection-now-friendship mechanics 2022-06-22 00:18:01 -03:00
ghoulslash
b33a8b0cb4 move ai score calc to STATE_TURN_START_RECORD so AI can consider move selection for item use 2022-06-05 11:09:04 -04:00
ghoulslash
c694e0cb90 merge w be 2022-06-05 08:22:24 -04:00
sneed
5934acbdc5 IS_BATTLER_OF_TYPE ignores 3rd type if mystery 2022-06-01 22:21:32 +03:00
BuffelSaft
16570e8c3f Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike 2022-05-22 12:55:55 +12:00
Eduardo Quezada D'Ottone
f80bab897f
Merge pull request #2112 from AgustinGDLV/evo_battle 
Gen 8 Evolution Mechanics (Battle Engine)
 2022-05-09 17:40:19 -04:00
Eduardo Quezada D'Ottone
cbe73de8c8
Merge pull request #1861 from LOuroboros/primalReversionTweaks 
Primal Reversion Tweaks
 2022-05-07 11:04:23 -04:00
BuffelSaft
8693db632b Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike 2022-05-07 12:27:20 +12:00
AgustinGDLV
e730d64945 corrections 2022-05-05 15:54:33 -07:00
BuffelSaft
5358cc0a00 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2 2022-04-25 13:38:13 +12:00
LOuroboros
fa39dc76dc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
LOuroboros
434f6cf5ad Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE 2022-03-26 08:43:55 -03:00
ExpoSeed
f50a406b18 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2022-03-22 12:56:23 -05:00
ultima-soul
86089ce935 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2022-02-28 22:13:14 -08:00
Eduardo Quezada D'Ottone
0dd2de988a
Merge branch 'battle_engine' into primalReversionTweaks 2022-02-12 23:08:12 -03:00
BuffelSaft
9d1800f53e Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2 2022-01-27 17:18:51 +13:00
LOuroboros
a8a8c7e2fa Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE 2022-01-23 02:37:07 -03:00
Eduardo Quezada D'Ottone
7d75e16312 Small documentation and cleanup 2022-01-20 12:25:48 -03:00
ghoulslash
035b2332af cache ai damage, effectiveness calcs 2022-01-13 11:28:27 -05:00
WiserVisor
8923ffb3af
Merge branch 'battle_engine' into battle_engine 2021-12-23 15:29:10 -08:00
Eduardo Quezada D'Ottone
a075cca448
Merge branch 'battle_engine' into fix-burmy 2021-12-18 13:38:12 -03:00
ultima-soul
b0b8b9bf46 Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-12-17 23:51:29 -08:00
ExpoSeed
d6747527da Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2021-12-16 21:44:01 -06:00
SonikkuA-DatH
b6fff16a7d
Update battle.h 2021-12-03 18:04:44 -08:00
ultima-soul
7369f60c06 Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync 2021-12-03 17:30:45 -08:00
LOuroboros
19af517bbb Edited pointless or useless Primal Reversion code 
Also added an equivalent to GetMegaEvolutionSpecies and GetWishMegaEvolutionSpecies for Primal Reversion.
Also also modified how CanBattlerGetOrLoseItem checks for Primal Reversion.
Also also also rewrote the check that triggers Primal Reversion in TryDoEventsBeforeFirstTurn.
 2021-12-01 00:56:33 -03:00
BuffelSaft
a89ce0c38a Swapped webs don't trigger Defiant 
Track the side that originally set Sticky Web, and if it matches the side the target of the speed drop is on, don't activate Defiant. Hard to tell if this is a bug or a feature in gen 8 - maybe the swapped webs are considered a "friendly" effect?

Also, fix Sticky Web not activating Defiant.
 2021-11-23 22:54:30 +13:00
BuffelSaft
499fb8071d Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2 2021-11-23 17:12:24 +13:00
BuffelSaft
62f01e89d7 Fix Burmy form change 
Wasn't properly tracking if Burmy had appeared in battle; gSentPokesToOpponent is used only for exp calculation and is cleared when an opponent faints, so a new var was needed.
 2021-11-23 00:46:43 +13:00
BuffelSaft
50d0cd52e8 Clean up Corrosive Gas 
Remove code and unused move effect.
 2021-11-22 15:13:54 +13:00
BuffelSaft
d2eb5f0e61 Remove shell trap effect code 
Left strings and animations as those were fine, but code was non-functional and fixing it was not trivial.
 2021-11-22 14:46:47 +13:00
BuffelSaft
70f0018c08 Partially implement Shell Trap 
Doesn't play the animation when the trap triggers, but kinda works? May also be incredibly buggy, but I'm not interested in working on this move any further.
 2021-11-22 14:14:41 +13:00
ultima-soul
a8f9a54787 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-11-21 10:41:32 -08:00
ultima-soul
3ed51d6d91 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-21 10:40:26 -08:00
BuffelSaft
bcaa17ffb3 Finish/tidy up Court Change 
Use a macro to simplify timer and status updates, and swap things like reflectBattlerId to the opposing side - this is required for the effects to be properly swapped.
 2021-11-21 17:20:45 +13:00
ghoulslash
37ab20e29c fix wish 2021-11-20 16:49:04 -05:00