ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,367 Commits 1 Branch 0 Tags 235 MiB
662dd7d2c6
Commit Graph

3521 Commits

Author SHA1 Message Date
LOuroboros
1595a66559 Implemented Triple Arrows' effect 2023-03-26 20:04:36 -03:00
ghoulslash
6574e01e73
Gen. 9 Move Effects, 1st batch (#2534) 2023-03-26 16:20:47 -04:00
GriffinR
6be9a79b8c
Merge pull request #1871 from GriffinRichards/doc-trendy-sayings 
Document the trendy sayings word group
 2023-03-24 08:05:51 -04:00
Zunawe
492422b6bd Fix scanner item flag name 2023-03-23 21:47:26 -07:00
LOuroboros
7ce5c5fc66 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1 2023-03-23 06:27:09 -03:00
tennis
358180946d Fix Intimidate targetting dead sides and false postpones 2023-03-22 11:46:50 +00:00
Eduardo Quezada
ef914a2fac Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 2023-03-21 16:13:27 -03:00
May8th1995
9ec31c61bf
Fixes weirdly set value for eject buttons etc (#2846) 
* Fixes weirdly set value for eject buttons etc

* Remove known fialing from fixed test

---------

Co-authored-by: tennis <May8th1995@users.noreply.github.com>
 2023-03-21 20:12:46 +01:00
Eduardo Quezada
51b716c9d9 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319 
# Conflicts:
#	data/battle_scripts_2.s
#	include/constants/battle_string_ids.h
#	include/constants/songs.h
#	src/battle_message.c
#	src/data/pokemon/species_info.h
 2023-03-19 20:28:56 -03:00
LOuroboros
f4e8389779 Added Psyblade and Hydro Steam 2023-03-17 09:25:39 -03:00
LOuroboros
aefd318945 Applied review suggestions and expanded usage of activateAfterFaint in Cmd_setmoveeffect 2023-03-14 11:43:52 -03:00
GriffinR
0c380862d6 Document the trendy saying word group 2023-03-13 15:58:40 -04:00
Eduardo Quezada
a0feaabef1 Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 2023-03-12 15:53:32 -03:00
Eduardo Quezada
7ce68994ec Made Mega Evolution properly use TryBattleFormChange 2023-03-12 02:32:09 -03:00
LOuroboros
6dbe772e27 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate 2023-03-10 18:23:33 -03:00
LOuroboros
f06c040bca Updated the debug menu 
-Updated the text string used by Debug_FlagsNotSetMessage.
-Renamed Debug_FlagsNotSetMessage to Debug_FlagsNotSetOverworldConfigMessage.
-Added an equivalent for the battle config file called Debug_FlagsNotSetBattleConfigMessage,
-DEBUG_FLAG_NO_COLLISION -> OW_FLAG_NO_COLLISION
 -And moved it to include/config/overworld.h, because at the end of the day it's still an overworld flag just like the other 2 already in that file.
-Corrected miswritten preproc config in DebugAction_Flags_CatchingOnOff.
-Updated the comment that describes the effect of DEBUG_OVERWORLD_MENU reducing the number of characters a tiny bit and fixing a typo.
 2023-03-08 15:27:22 -03:00
DizzyEggg
bf4735e87c remove test changes 2023-03-08 13:41:08 +01:00
DizzyEggg
f6089a0057 Mega Evolution after switching and based on speed 2023-03-07 22:34:57 +01:00
Eduardo Quezada
4625a46748 Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	src/battle_interface.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/battle_util.c
 2023-03-07 11:26:33 -03:00
Eduardo Quezada D'Ottone
81a80e566c
Refactor Mega Evolution indicator sprite (#2805) 2023-03-07 08:06:28 -03:00
DizzyEggg
a04046dbb6
Add tests for Defog and fix Defog battle strings (#2737) 
* start working on defog tests

* defog tests + improve terrain end battlescripts

* newline
 2023-03-06 20:35:08 +01:00
DizzyEggg
306c4565a0 merge 2023-03-06 15:32:28 +01:00
Eduardo Quezada D'Ottone
b3ffc9d1c4
Set link tutorial as complete when using Cheat Start (#2802) 2023-03-06 09:29:34 +01:00
GriffinR
bb078e0618
Merge pull request #1864 from AsparagusEduardo/pret/doc/songsComments 
Document music usage to make it easier to search for a specific track
 2023-03-05 15:29:38 -05:00
Eduardo Quezada
a6bd35ceab Review changes 2023-03-05 17:17:39 -03:00
ghoulslash
dec1b16138
Swallow/Spit Up Gen 5 Behavior and tests for Swallow/Spit Up/Stockpile (#2790) 2023-03-05 09:50:47 -05:00
GriffinR
ce6875817f
Merge pull request #1860 from GriffinRichards/metatile-labels 
Format metatile_labels
 2023-03-04 23:36:04 -05:00
Eduardo Quezada
9917f5cc8b Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303 
# Conflicts:
#	Makefile
#	include/constants/pokemon.h
#	include/pokemon.h
#	make_tools.mk
#	src/battle_ai_script_commands.c
#	src/battle_controllers.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/party_menu.c
#	src/pokemon.c
#	src/trade.c
#	src/trainer_pokemon_sprites.c
 2023-03-03 11:00:50 -03:00
ghoulslash
4e138fa4b7
Fix wrong Contrary message when affected by Intimidate (#2723) 2023-03-02 09:38:00 -05:00
LOuroboros
fe735f9700 Applied review suggestions 
-Merged EFFECT_CEASELESS_EDGE and EFFECT_STONE_AXE into EFFECT_HIT_SET_ENTRY_HAZARD

-Updated gDmgHazardsStringIds and relevant battle scripts. Can't say that I like it at all. String tables are stupid imo.

-Coupled Barb Barrage's effect in CalcMoveBasePower with Venoshock's
 2023-03-02 01:39:44 -03:00
LOuroboros
fe74dd938b Small corrections 2023-03-01 04:00:19 -03:00
LOuroboros
23673c2e9d Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1 2023-03-01 03:57:00 -03:00
GriffinR
ec89e519f9
Merge pull request #1858 from AsparagusEduardo/pret/doc/fateful 
Rename eventLegal to modernFatefulEncounter
 2023-02-28 11:48:34 -05:00
DizzyEggg
c92a65dc40 Add config for stockpile raising def stats 2023-02-27 21:09:02 +01:00
DizzyEggg
3338a6b786 add messages for stockpile effects wear off 2023-02-27 12:31:29 +01:00
LOuroboros
a54a8d9b2a Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate 2023-02-27 07:43:19 -03:00
AgustinGDLV
e537be76ea
Z-moves bypass protection (#2730) 2023-02-27 09:17:07 +01:00
DizzyEggg
44d2cc7232
Fix bugs related to Trainer Slide messages (#2699) 
* start working on trainer slides

* use cmd->nextInstr
 2023-02-27 09:11:25 +01:00
LOuroboros
fe09f3e0d3 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate 2023-02-26 23:42:01 -03:00
Eduardo Quezada
41bf9ea63c Removed trailing whitespaces 2023-02-26 18:43:15 -03:00
DizzyEggg
8ccffa617a fix createspriteontargets on electricy anim 2023-02-26 19:47:44 +01:00
DizzyEggg
4bdca43dbd refactor mega evolution indicator sprite 2023-02-26 12:51:35 +01:00
Zunawe
f376b71f7c Fix wrong route in item flag name 2023-02-25 13:48:39 -08:00
Eduardo Quezada
d330ca051a Document music usage to make it easier to search for a specific track 2023-02-23 11:44:23 -03:00
Eduardo Quezada
f5aa3b8272 Document the 2 different sText_GotchaPkmnCaught 2023-02-23 11:43:40 -03:00
ghoulslash
827bf11307
Merge pull request #2660 from DizzyEggg/ace_voltswitch 
Fix Volt Switch / Roar with ace pokemon
 2023-02-23 09:20:18 -05:00
DizzyEggg
dc83708443 Remove unused script BattleScript_TargetAbilityStatRaiseOnMoveEnd 2023-02-22 22:51:59 +01:00
Zunawe
60be59d18b Fix wrong route in hidden item flag name 2023-02-22 13:13:57 -08:00
DizzyEggg
877e3fd6af merge with upcoming 2023-02-22 19:27:42 +01:00
DizzyEggg
460dceb48b fix intimidate derp 2023-02-22 19:20:18 +01:00
DizzyEggg
83281944fa Add tests for Contrary 2023-02-22 16:24:27 +01:00
DizzyEggg
e0b76e98ff
Add MOVE_SHELL_TRAP Effect (#2716) 
* implemented Shell Trap

Co-authored-by: AgustinGDLV <agustingomezdelavega@gmail.com>
 2023-02-22 13:55:34 +00:00
DizzyEggg
64e26f5c86 Fix Contrary String on Intimidate 2023-02-22 13:11:16 +01:00
Jaizu
403a6f4544
Merge pull request #2712 from DizzyEggg/fix_abilities_empty_field 
Fix switch-in abilities activating on an empty field
 2023-02-22 09:49:13 +01:00
DizzyEggg
31138455de remove unneeded VARIOUS_JUMP_IF_NO_VALID_TARGETS 2023-02-22 09:28:12 +01:00
DizzyEggg
d73ab0246f
Fix Explosion + Galvanize + Volt Absorb and Mind Blown (#2688) 
* Fix Explosion and Mind Blown
* Use battler ability in jumpifabilitypresent
 2023-02-21 22:50:29 +00:00
Eduardo Quezada
5ca9213d07 Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	src/battle_script_commands.c
 2023-02-21 17:47:02 -03:00
Martin Griffin
29c64c82f3 Test Red Card 
Dragon Tail activates Red Card if the target does not switch.
 2023-02-21 10:44:58 +00:00
Martin Griffin
afe09e9653 Test Dragon Tail 
Remove the "But it failed!" message if the foe cannot be switched.
 2023-02-21 10:43:57 +00:00
LOuroboros
24581426a1 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate 2023-02-21 04:46:28 -03:00
LOuroboros
3a91a5c930 Added new trainer slide-in msg conditions 
Now they can say something:
-When their last Pokémon's HP is between 25% and 50%.
-When a critical hit is dealt to their first Pokémon for the first time.
-When a super effective hit is dealt to their first Pokémon for the first time.
-When a STAB move is used against (but doesn't faint) the opponent's Pokémon.
-When the Player's Pokémon's move doesn't affect the opponent's Pokémon.
-When they're about to trigger a Mega Evolution.
-When they're about to trigger a Z-Move.

Misc. changes:
-Split GetEnemyMonCount for readability's sake.
-Optimized the size allocated to trainerSlideLowHpMsgDone.
 2023-02-21 04:40:02 -03:00
Zunawe
8f74a6777a Fix spelling mistake for item flag 2023-02-20 18:17:30 -08:00
DizzyEggg
53180ebf87
Update Healing wish to gen5 / gen8 mechanics (#2708) 
* Updated Healing Wish and added config
* Fixed Lunar Dance message

Co-authored-by: AgustinGDLV <agustingomezdelavega@gmail.com>
Co-authored-by: AgustinGDLV <103095241+AgustinGDLV@users.noreply.github.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
 2023-02-20 11:25:43 +00:00
ghoulslash
4b64433816
Add Battle Anim cmds for dynamic Task, Sprite creation + Misc. Anim Fixes (#2649) 
* add createvisualtaskontargets, createspriteontargets to fix electroweb, fiery wrath anims

* add missing semicolon

* add Cmd_createspriteontargets_onpos for heal block, fix heal block targeting

* remove duplicate func

* improve origin pulse anim

* fix IsDoubleBattle call

* venom drench acid uses average battler positions

* add GetSubpriorityForMoveAnim

* add GetBattleAnimMoveTargets for CreateSpriteOnTargets and Cmd_createvisualtaskontargets

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-02-19 11:48:12 +01:00
DizzyEggg
66d2f253a1 merge with master 2023-02-17 15:43:15 +01:00
DizzyEggg
0c523f9518
Fix Magic bounce powder moves against grass types (#2633) 
* Fix Magic bounce powder moves against grass types
 2023-02-17 13:55:51 +00:00
DizzyEggg
56c9564e7a
8th gen Howl's effect (#2700) 
* Howl gen8 effect
 2023-02-17 10:28:46 +00:00
Eduardo Quezada D'Ottone
625a7622e2
Merge pull request #2697 from AsparagusEduardo/RHH/sync/pret_20230214 
It's ya boi, pret merge! (pret merge 2023/02/16)
 2023-02-16 21:57:41 -03:00
Eduardo Quezada
f4f8ab6ee9 Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 2023-02-16 17:06:49 -03:00
ghoulslash
6b0b427d93
Merge pull request #2680 from DizzyEggg/mirror_armor 
Fix Mirror Armor against Clear Body
 2023-02-16 09:29:04 -05:00
ghoulslash
60a3da5811
Merge pull request #2691 from DizzyEggg/clang_scales 
Fix Clanging Scales target and effect
 2023-02-16 09:13:33 -05:00
DizzyEggg
4c18ed2bd4 remove comment 2023-02-16 15:11:48 +01:00
ghoulslash
8c81cf1e66
Merge pull request #2692 from DizzyEggg/shields_down 
Fix Shield Down Ability pop-up
 2023-02-16 09:11:24 -05:00
DizzyEggg
1c970afd6a
fix follow me working in singles (#2644) 
* fix follow me working in singles
 2023-02-16 10:53:29 +01:00
DizzyEggg
f6a0c882d1 Fix Shield Down Ability pop-up 2023-02-15 23:44:00 +01:00
DizzyEggg
94651e77a5 Fix Clang Scales target and effect 2023-02-15 22:18:18 +01:00
Eduardo Quezada
b62e5aa72e Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214 
# Conflicts:
#	src/battle_main.c
#	src/field_specials.c
#	src/trade.c
 2023-02-15 14:11:03 -03:00
Eduardo Quezada
bd54990333 Review changes 2023-02-15 13:56:11 -03:00
GriffinR
69fdf0faa4
Merge pull request #1853 from GriffinRichards/doc-contest-bar 
Clarify AI_CV_AttackDown_UnknownTypeList
 2023-02-15 11:29:57 -05:00
GriffinR
b656565af0 Standardize RS mossdeep gym metatile labels 2023-02-14 11:42:13 -05:00
ghoulslash
908b509401
Fix Round's Base Power calc, Add Turn order effects (#2602) 
* fix round base power calc, add turn order change

* remove unused callnative cmd

* fix round turn order update

* fix moveTarget getting set incorrectly in HandleAction_UseMove. also redirection doesn't affect MOVE_TARGET_ALL_BATTLERS

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-02-14 16:49:50 +01:00
DizzyEggg
0577d8d04d Fix Mirror Armor against Clear Body 2023-02-13 14:44:34 +01:00
ghoulslash
d508f12ac9 merge with upcoming 2023-02-13 08:38:32 -05:00
DizzyEggg
5d958e245a
Merge pull request #2669 from Jaizu/giga_impact_contests 
Fix Giga Impact on contests.
 2023-02-13 09:22:24 +01:00
Eduardo Quezada
96865f66af Updated term to modernFatefulEncounter 2023-02-11 22:36:42 -03:00
Eduardo Quezada
6da5e0a280 Rename eventLegal to fatefulEncounter 2023-02-11 17:13:53 -03:00
DizzyEggg
513ecd50ba Fix Spacial Rend animation 2023-02-09 13:24:23 +01:00
Jaizu
9f7267e48d Fix Giga Impact on contests. 2023-02-09 11:29:29 +01:00
DizzyEggg
896b575c07 Fix volt switch breaking ace pokemon 2023-02-08 12:42:38 +01:00
DizzyEggg
ff088752e7
Insomnia ability pop-up (#2643) 
* Insomnia ability pop-up

* remove B_MSG_STAYED_AWAKE_USING constant
 2023-02-07 18:47:23 +01:00
ghoulslash
7e9d40d401
Merge pull request #2645 from DizzyEggg/damp_aftermath 
Damp shows ability pop-up when reacting with Aftermath
 2023-02-07 10:18:23 -05:00
DizzyEggg
dcb63e1518
Merge pull request #2610 from ghoulslash/be/animsilktrap 
Silk trap Animation
 2023-02-07 16:13:53 +01:00
ghoulslash
a775f6f31a
Merge pull request #2642 from AlexOn1ine/strange_steam_v2 
Fix Strange Steam anim
 2023-02-07 09:25:04 -05:00
DizzyEggg
0dc5e1e685 aftermath damp pop-ups and string 2023-02-07 13:01:56 +01:00
ghoulslash
0c4c3fbbb7
Fix Poison Gas Anim for MOVE_TARGET_BOTH (#2608) 
* poison gas anim handles MOVE_TARGET_BOTH

* fix sprite position fields

* fix it again

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-02-07 12:14:36 +01:00
Alex
2f412b206a Fix Strange Steam anim 2023-02-07 00:40:37 +01:00
DizzyEggg
04ce8ec213 Fix Volt Absorb not activating on Thunderwave 2023-02-06 20:55:56 +01:00
ghoulslash
f060d0185f fix wind power, electromorphosis stomping on gbattlerattacker 2023-02-02 21:59:40 -05:00
ghoulslash
c5c0e91215 fix BattleScript_TargetAbilityStatRaiseRet overwriting gBattlerAttacker 2023-02-02 21:39:01 -05:00
Eduardo Quezada
101ea6522d Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	src/battle_util.c
 2023-02-02 17:56:13 -03:00
LOuroboros
4b5a6e2328 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1 2023-02-01 20:18:56 -03:00
GriffinR
28ada9c93b Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest-bar 2023-02-01 15:52:19 -05:00
GriffinR
9003966fcc Misc field_specials cleanup 2023-02-01 11:48:55 -05:00
ghoulslash
3f616215ea add silk trap anim 2023-01-28 09:03:18 -05:00
Martin Griffin
a13ffdbfba U-turn does not switch the user out if Emergency Exit activates 2023-01-27 00:57:22 +00:00
Eduardo Quezada
7774c9727d Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230125 
# Conflicts:
#	tools/mapjson/mapjson.cpp
 2023-01-25 20:28:55 -03:00
Eduardo Quezada
3288309c43 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	src/battle_script_commands.c
 2023-01-25 19:57:19 -03:00
Eduardo Quezada D'Ottone
1bfc922c72
Merge pull request #2471 from ghoulslash/be/gen9items 
Start Gen9 Hold Effects
 2023-01-23 14:58:08 -03:00
Eduardo Quezada D'Ottone
2b22bdf1e7
Merge pull request #2579 from LOuroboros/allahu 
Fixed Explosion & Intimidate's 'interaction'
 2023-01-23 11:37:06 -03:00
ghoulslash
f97ec1975a merge w upcoming 2023-01-23 09:24:03 -05:00
GriffinR
29c1af50ca Fix Best Streak stat name 2023-01-20 11:25:04 -05:00
Eduardo Quezada
4a9515e8db Restored improvements from upstream 2023-01-20 12:34:15 -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
GriffinR
b7d92e8537 Revert incorrect constant usage, add new correct ones 2023-01-18 12:11:09 -05:00
GriffinR
5a906c33ac
Merge branch 'master' into sync_battle_anim_args 2023-01-18 11:47:33 -05:00
LOuroboros
773e7f0de2 Fixed Explosion & Intimidate's 'interaction' 2023-01-17 22:16:42 -03:00
GriffinR
c663154760
Merge pull request #1836 from GriffinRichards/fix-clone 
Add fix for Battle Tower cloning bug
 2023-01-15 00:32:24 -05: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
bdcc84f019 Updated the implementation 2023-01-09 15:18:22 -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
ghoulslash
cc7c546011
Merge pull request #2473 from LOuroboros/mimicry 
Reimplemented Mimicry
 2023-01-09 12:54:44 -05: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
91b2e1bb50 More review changes and added lackings 
-Removed unnecessary special handling of terrain-inducing overworld weather states from ChangeTypeBasedOnTerrain.
-Mimicry now activates normally for terrain-inducing overworld weather states.
-Weather abilities now activate normally when switchineffects is called, and at the beginning of a battle.
-Terrain abilities now activate normally at the beginning of a battle.
 2023-01-09 07:55:55 -03:00
Eduardo Quezada
d72a3731d4 Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald 
# Conflicts:
#	include/constants/battle_move_effects.h
 2023-01-06 15:25:49 -03:00
LOuroboros
72566e6323 Turned Stone Axe's and Ceaseless Edge's effects into MOVE_EFFECTs 2023-01-05 03:02:56 -03:00
LOuroboros
2414283bb7 Removed BattleScript_EffectHit_Ret 2023-01-04 12:32:55 -03:00
ghoulslash
a425de77a6
Merge pull request #2446 from LOuroboros/primal 
Updated AnimTask_PrimalReversion
 2023-01-04 09:16:28 -05:00
Eduardo Quezada
ada47831aa Fixed reusable repels/lures function forcefully using items while menu config is on 2023-01-04 00:00:13 -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
0a00942a26 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1 2023-01-02 16:00:13 -03:00
ghoulslash
8b28d4329b
Merge pull request #2525 from AsparagusEduardo/RHH/pr/fix/FixFrontierTutor2 
Fixed right Frontier move tutor not loading their move list correctly.
 2023-01-02 13:55:00 -05: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
LOuroboros
ca32d43433 Streamlined ability-on-weather changes 
Also renamed activateweatherabilities and activateterrainabilities.
 2023-01-02 14:32:56 -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
Eduardo Quezada D'Ottone
4dc72dcfc1
Merge pull request #1956 from SonikkuA-DatH/SonikkuA-DatH-Teatime2 
Implementing Teatime effect
 2022-12-30 17:49:54 -03:00
LOuroboros
e8dfb66c30 Adding ability effect triggers for terrains and weather 
A new, probably better way to handle the announcement trigger that abilities such as Protosynthesis and Quark Drive have, when the battle weather or the field terrain change.

Misc. changes:
-EFFECT_DAMAGE_SET_TERRAIN -> EFFECT_HIT_SET_REMOVE_TERRAIN
 -It's more appropriate as the effect can be used to force set a terrain or simply to remove an active terrain, after all.
 -The main reason for the rename was the inconsistency with the battle script's label.
-Reverted accidentally committed change to B_DOUBLE_WILD_CHANCE, performed back in c8abf00c.
 2022-12-30 03:25:16 -03:00
GriffinR
e88139d1b5 Add fix for Battle Tower cloning bug 2022-12-29 11:22:53 -05:00
LOuroboros
0ef148dfbb Applied more corrections 
-Removed BattleScript_WindRiderActivatesEnd2
-Tweaked the condition of Wind Power in AbilityBattleEffects
-Renamed ApplySupremeOverlordModifier to GetSupremeOverlordModifier
 2022-12-28 08:50:15 -03:00
LOuroboros
0159065dea Removed Shell Trap 
It's time to let it go for my own mental sanity.
Besides, it's a Gen. 7 move. I shouldn't have added it here.
 2022-12-28 07:51:11 -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
LOuroboros
17410fa9c5 Fixed some issues of the Intimidate's rework 2022-12-26 00:50:44 -03:00
SonikkuA-DatH
3e807e5b1e
Update battle_scripts_1.s 
fix ORs
 2022-12-21 15:12:06 -08:00
LOuroboros
4bb86c5d96 Implemented Barb Barrage's effect 2022-12-21 19:48:50 -03:00
LOuroboros
1229fa752a Fixed Triple Axe's target, added its effect and fixed Ceaseless Edge's 2022-12-21 19:48:49 -03:00
LOuroboros
2cb9400ef0 Implemented Dire Claw's effect 2022-12-21 19:48:48 -03:00
LOuroboros
3ce4869766 Implemented Shell Trap's effect 2022-12-21 19:48:10 -03:00
LOuroboros
ae482ed1f4 Implemented Ceaseless Edge's effect 2022-12-21 19:47:00 -03:00
SonikkuA-DatH
0a5154499e
Update battle_scripts_1.s 
Compensating Substitute, removing item
 2022-12-21 14:27:39 -08:00
Eduardo Quezada
c0d4e14a61 Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald 
# Conflicts:
#	include/config/battle.h
#	include/constants/battle_move_effects.h
 2022-12-21 12:46:09 -03:00
LOuroboros
31cd076f9d Oopsie. Wind Power doesn't boost Attack lol 2022-12-21 11:21:42 -03:00
LOuroboros
d943f891c5 Applied Wind Power and Wind Rider correction 
-Renamed TryActivateWindRiderLoop to BattleScript_TryTailwindAbilitiesLoop
-Modified how it handles the check for Wind Rider by using a various and incorporated Wind Power into the mix because that ability is affected by Tailwind as well.
 2022-12-21 10:08:16 -03:00
SonikkuA-DatH
5eaf0e15fc
Update data/battle_scripts_1.s 
-_-

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-12-20 18:08:01 -08: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
SonikkuA-DatH
f6fab92ac8
Merge branch 'upcoming' into SonikkuA-DatH-Teatime2 2022-12-19 15:52:20 -08: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
SonikkuA-DatH
562736a5e6
Update battle_scripts_1.s 
Changed STAT_BUFF_ALLOW_PTR to STAT_CHANGE_ALLOW_PTR
 2022-12-18 22:50:41 -08:00
SonikkuA-DatH
2dbfc1c8f5
Update data/battle_scripts_1.s 
Fixes spacing. Thanks Lunos!

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-12-18 22:28:33 -08:00
SonikkuA-DatH
f0aee1f8d3
Merge branch 'upcoming' into SonikkuA-DatH-Teatime2 2022-12-18 17:50:39 -08:00
SonikkuA-DatH
9cd8d81412
Update battle_scripts_1.s 
Fixed spacing
 2022-12-18 15:37:44 -08:00
Eduardo Quezada
55ba9d8364 Fixed right Frontier move tutor not loading their move list correctly. 2022-12-18 13:17:33 -03:00
LOuroboros
4c9446ed0a Fixed Speed Swap's effect 2022-12-14 12:00:45 -03:00
LOuroboros
a3e58b05c1 Implemented Guard Dog's effect 2022-12-12 20:33:37 -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
ghoulslash
340278c83b
Merge pull request #2452 from LOuroboros/intimidate 
Optimized Intimidate's code
 2022-12-11 22:04:16 -05:00
LOuroboros
8eff1a13c1 Updated BattleScript_IntimidateEffect to comply with BattleScript_TryAdrenalineOrb's demands 2022-12-11 23:17:59 -03:00
LOuroboros
e6a3396b0f Added Adrenaline Orb check and removed silly comment 2022-12-11 19:24:36 -03:00
ghoulslash
0a9e3c8dc8 fix stattextbuffer in BattleScript_IntimidatePrevented_Item 2022-12-11 16:16:10 -05:00
ghoulslash
e3e0d60222
Merge pull request #2467 from Bassoonian/gen9moves 
Generation IX Moves
 2022-12-11 14:47:47 -05:00
LOuroboros
0d1f9d9613 Reimplemented Mimicry 2022-12-09 20:46:18 -03:00
ghoulslash
6d28882e44 start gen9 hold effects 2022-12-06 09:48:36 -05:00
LOuroboros
d6b9f07681 Implemented Earth Eater's effect 2022-12-06 05:30:21 -03:00
LOuroboros
a961980e0f Implemented Toxic Debris' effect 2022-12-06 05:23:30 -03:00
LOuroboros
aa051dab02 Implemented Costar's effect 2022-12-06 05:23:30 -03:00
LOuroboros
7a52404fd3 Implemented Supreme Overlord's effect 2022-12-06 05:23:30 -03:00
LOuroboros
f96137eb5e Implemented Cud Chew's effect 2022-12-06 05:23:30 -03:00
LOuroboros
7c67f1ac27 Activated Switch In abilities during weather and terrain change 
Abilities such as Protosynthesis and Quark Drive demand it.
 2022-12-06 05:23:30 -03:00
LOuroboros
24465858a7 Implemented the 4 Ruin Abilities 2022-12-06 05:23:29 -03:00
LOuroboros
de05c4dd56 Implemented Good as Gold's effect 2022-12-06 05:23:29 -03:00
LOuroboros
e25f843db3 Implemented Quark Drive's effect 
Also tweaked STRINGID_SUNLIGHTACTIVATEDABILITY and STRINGID_STATWASHEIGHTENED.
 2022-12-06 05:23:29 -03:00
LOuroboros
a328088122 Implemented Protosynthesis' effect 
Also turned GetHighestStatId into a global function since Protosynthesis' effect uses it.
 2022-12-06 05:23:29 -03:00
LOuroboros
34cafa746c Implemented Electromorphosis' effect 
Also added a battle preproc config to check if the STATUS3_CHARGED_UP was already applied.
Pokémon Scarlet and Violet don't check if this status flag was already applied on the target of abilities like Electromorphosis (and Wind Power until proven otherwise.)
As a result, the game will trigger the ability multiple times if they're hit by a multihit move.
This directive makes the code end the ability effect preemptively if the target does have the status flag applied.
 2022-12-06 05:23:29 -03:00
LOuroboros
88cae380d0 Implemented Wind Power's effect 2022-12-06 05:23:29 -03:00
LOuroboros
c43060fbfd Tweaked BattleScript_WellBakedBodyActivates and BattleScript_WindRiderActivatesMoveEnd 2022-12-06 05:23:29 -03:00
LOuroboros
4dc44150c5 Implemented Wind Rider's effect 2022-12-06 05:23:29 -03:00
LOuroboros
ca656b63b9 Added Well Baked Body's effect and misc. changes 
-Added a modifybattlerstatstage macro to handle stat stages in battle.
-Rewrote the checks inside the case ABILITYEFFECT_MOVES_BLOCK of AbilityBattleEffects.
 2022-12-06 05:21:24 -03:00
LOuroboros
eb082cd1a2 Implemented Purifying Salt's effect 2022-12-03 01:51:11 -03:00
LOuroboros
acb9c31bd4 Implemented Anger Shell's effect 2022-12-03 01:19:24 -03:00
LOuroboros
b0027cb78b Implemented Seed Sower's effect 2022-12-02 23:31:41 -03:00
GriffinR
483c3d5c13 Document wonder news 2022-11-22 02:17:03 -05:00
Bassoonian
739680e425 Victory Dance effect 2022-11-18 22:23:34 +01:00
Bassoonian
29ae22183b Mystical Power effect 2022-11-18 22:17:08 +01:00
Bassoonian
9512b3a57a Implement Double Shock functionality with temporary string 2022-11-18 22:12:26 +01:00
Bassoonian
3ac3cb249e Wicked Torque effect 2022-11-18 22:00:21 +01:00
Bassoonian
f7d1a12d2d Data entry for gen9 moves 2022-11-18 12:15:44 +01:00
Eduardo Quezada
011ec16f1e Organized conffig files into their own folder and cleaned up 2022-11-14 11:03:49 -03:00
LOuroboros
11c99cac61 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux 2022-11-13 23:17:59 -03:00