hetoord
40a5995ead
Teatime tests and fixes ( #3096 )
2023-07-03 09:54:43 +02:00
Eduardo Quezada
2c4a9b754d
Merge branch 'RHH/master' into RHH/upcoming
2023-06-30 16:14:57 -04:00
ghoulslash
304fc4c5b5
Fix disobedience wrong move effect issue ( #3089 )
2023-06-30 09:03:18 -04:00
Eduardo Quezada D'Ottone
81e59ace25
Cleaned up remaining Castform hack stuff ( #3063 )
...
* Removed gCastformFrontSpriteCoords
* Removed sCastformElevations and IsCastformForm
* Removed sCastformBackSpriteYCoords and castformPalette in BattleStruct
* Scrubbed unused BS commands
* Removed B_ANIM_CASTFORM_CHANGE and BattleForm constants
* Removed redundant function in Pokémon Debug menu
* Removed handling in animation scripts
* Removed gBattleMonForms
* Reduced MAX_MON_PIC_FRAMES to 2
* Removed Castform/Cherrim makefile stuff
* Fixed weather form change tests not checking species.
* Fixed Castform palettes after Lunos' PR
2023-06-30 09:58:07 +02:00
Alex
ea7e6265dd
Small Grassy Glide anim bug ( #3092 )
2023-06-29 14:07:46 -04:00
Alex
20099274d8
Fix Clear Amulet visual bug + Tests ( #3074 )
...
* Fix Clear Amulet visual bug + Tests
TODO Tests, additional tests + Triple Kick pp bug
* Wonder Guard message, switch instead of if, misalignments
2023-06-28 12:26:03 -04:00
DizzyEggg
f9058a8544
Fix disobedience wrong move effect issue
2023-06-28 12:47:20 +02:00
PSF
b2901c51b0
Added bugfix for SaveBeforeLinkMultisChallenge to remove extra incrementgamestat
2023-06-27 15:34:31 -07:00
ghoulslash
7371a9e401
Add many gen 8 move animations ( #2861 )
...
* port many gen8 and 9 move anims from cfru
* fix thunder cage, shell smash, shelter anims. update anim credits
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-06-21 13:19:54 -04:00
LOuroboros
2bf88502a7
More corrections
2023-06-19 04:18:53 -03:00
LOuroboros
9896f20eb8
Applied fixes and corrections (Jun 2023)
2023-06-15 09:22:26 -03:00
LOuroboros
81bb299e7f
Updated Axe Kick's battle script
...
I have no idea why is this working now when I'm pretty sure it didn't work before, but I consider this a win all the same.
2023-06-13 06:50:48 -03:00
LOuroboros
313f522622
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch2
2023-06-13 05:44:37 -03:00
Alex
112636b8f3
Fix Speed Boost animation
2023-05-28 11:54:43 +02:00
ghoulslash
a929ae8b48
Replace launchtemplate and launchtask in battle anims ( #2640 )
...
* replace launchtemplate with createsprite using fix_launchtemplate.py
* tidy up script
* fix comment handing in fix_launchtemplate.py
* fix double comma after sprite template
* remove py script
* convert launchtask -> createvisualtask
* fix launchtask->createvisualtask issue
* fix ANIM_PAL ORs
* remove launchtemplate, launchtask macros
* fix pal macros in z moves
* fix bloom doom
* add F_PAL_ALL_BUT_DEF
* remove all ANIM_PAL_ usages
* devestating drake fix
* convert launchsoundtask and setblends
* Reworked CFRU macro PR
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2023-05-27 17:32:53 -04:00
Eduardo Quezada D'Ottone
84d9cd0396
Fixed compile issue when disabling overworld debug menu ( #3024 )
2023-05-24 08:24:44 -04:00
Eduardo Quezada D'Ottone
b972199141
Battle Item Refactor Fixes ( #3022 )
2023-05-23 21:32:57 -04:00
AgustinGDLV
5a8715e608
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into castform_fix
2023-05-23 16:10:44 -07:00
AgustinGDLV
bb10b0d1b0
fixed GetBattlerSide, removed debug script
2023-05-23 15:50:51 -07:00
AgustinGDLV
34382fcece
fixed revive in 1v2 battles
2023-05-23 14:19:24 -07:00
Alex
109b4c4f6c
Small clean up: EndTurnTerrain, BattleScript_GrassyTerrainHeals ( #3018 )
...
remove leftover
2023-05-20 15:58:55 -04:00
LOuroboros
580a09e367
Updated DebugAction_Util_CheckSaveBlock
2023-05-20 15:40:36 -03:00
ghoulslash
487415e56b
Move direct statStage boosts to use statbuffchange ( #3000 )
...
* fix double counting stat boosts for download, moxie beast boost etc
* speed boost use statbuffchange
* BattleScript_MoveStatDrain use statbuffchange
* statbuffchange for rage
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2023-05-17 11:22:23 -04:00
AgustinGDLV
785b100693
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into castform_fix
2023-05-16 16:29:38 -07:00
AgustinGDLV
0c182345bf
reworked weather form reversion + added more tests
2023-05-16 16:24:25 -07:00
AgustinGDLV
37874fe5c1
fixed revival blessing failure still showing anim ( #3010 )
2023-05-16 19:21:05 -04:00
Eduardo Quezada D'Ottone
2aca82300c
Merge branch 'upcoming' into mega_evo_issues
2023-05-14 22:33:01 -04:00
Ultimate Bob
f985eefaa1
Show Imposter abilty in popup instead of opponent's ability.
2023-05-09 01:40:28 +10:00
Salem
fe5e59c910
Merge branch 'upcoming' into RHH/content/gen9SnowWeather
2023-05-07 17:27:58 +02:00
Eduardo Quezada D'Ottone
c530eb2445
Add mirror herb ( #2873 )
2023-05-06 21:20:37 -04:00
Eduardo Quezada D'Ottone
42445512ad
Battle Item Tests + critical fixes + new test macro ( #2940 )
2023-05-06 20:43:32 -04:00
AgustinGDLV
a5f28afe42
fixed Forecast and Flower Gift
2023-05-04 17:04:54 -07:00
CallmeEchoo
eb5b81684c
refactored snow into damaging weather
...
this is necessary for ice body to properly work.
doesnt actually do any damage
2023-05-05 01:38:12 +02:00
Alex
957ee36c75
Fix for Ceaseless Edge/Axe Kick visual glitch ( #2969 )
2023-05-02 17:25:44 -04:00
Salem
a877266400
Merge branch 'upcoming' into RHH/content/gen9SnowWeather
2023-05-02 21:19:01 +02:00
CallmeEchoo
c5a73f59a4
ad suggested changes
2023-05-02 21:17:14 +02:00
Shae
ae2d5f7d1e
Weather related Ability tests, fix for Leaf Guard not preventing Rest. ( #2957 )
2023-05-02 14:08:05 -04:00
CallmeEchoo
c32d5f455b
fix rebase issues
2023-05-02 16:44:42 +02:00
CallmeEchoo
f6e80b0ca7
Merge branch 'RHH/content/gen9SnowWeather' of https://github.com/CallmeEchoo/pokeemerald into RHH/content/gen9SnowWeather
2023-05-02 16:29:11 +02:00
CallmeEchoo
76721b16f8
add snow weather
2023-05-02 16:25:26 +02:00
ghoulslash
445e9c4b8b
merge w upcoming
2023-05-01 12:05:07 -04:00
ghoulslash
8cce130643
Add Frostbite status ( #2942 )
2023-05-01 09:45:47 -04:00
Ultimate_Bob
32e63d8cc7
Don't copy opponent personality when swapping mon sprite during Mega Evolution ( #2852 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-04-30 21:15:03 -04:00
Alex
2d6282fece
Fix for Burn Up/Double Shock ( #2962 )
2023-04-30 10:46:21 -04:00
ghoulslash
62ca66bc6b
Refactoring Battle Form changes into the form change tables ( #2411 )
2023-04-30 08:41:54 -04:00
CallmeEchoo
99cbd2af37
add snow weather
2023-04-29 20:35:58 +02:00
Alex
0cbb80dda7
Fix grassy terrain freezing the game ( #2959 )
2023-04-28 08:58:43 -04:00
Bassoonian
c279830892
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into formbattlechangecontribution
2023-04-27 10:50:32 +02:00
Eduardo Quezada D'Ottone
408aa30aa7
Merge pull request #17 from AgustinGDLV/pr/castform_fix
2023-04-26 14:25:36 -04:00
Salem
78c4d07b23
Add Berserk Gene Item ( #2893 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-04-25 15:03:57 -04:00
Bassoonian
b1f75569a1
Merge branch 'upcoming' into rhhupcomingdev
2023-04-25 19:50:26 +02:00
CallmeEchoo
503035010e
Merge branch 'upcoming' into battleItemFixes
2023-04-24 21:11:34 +02:00
ghoulslash
868838a87d
Add thunder cage case to trap anim IDs ( #2941 )
2023-04-24 14:35:42 -04:00
LOuroboros
a128192bfe
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate
2023-04-24 09:36:09 -03:00
ghoulslash
1f6e335a24
merge w upcoming
2023-04-23 18:11:57 -04:00
Bassoonian
f13c39d784
Thawing out for frostbite
2023-04-23 21:20:23 +02:00
Bassoonian
13f6acf9a1
General mechanics
2023-04-23 19:20:48 +02:00
ghoulslash
cf17324040
Fixed duplicate item strings in Bag/Party menus with battle items ( #2915 )
2023-04-23 08:32:38 -04:00
Bassoonian
a561c6da6a
Add config to Frostbite & allow it to be inflicted
2023-04-22 23:14:49 +02:00
Bassoonian
f50bfb3770
Frostbite hurts at the end of the turn and halves SpA
2023-04-22 18:47:36 +02:00
CallmeEchoo
38476bd22c
fix Full Restore not healing confusion
2023-04-21 21:37:02 +02:00
LOuroboros
b09ab5a3ee
Updated Triple Arrows' effect's code and tests yet again
...
Also added a function to get a move's secondaryEffectChance, meant to handle abilities, side statuses and the like that modify it.
2023-04-19 01:57:34 -03:00
LOuroboros
28ce87f6d3
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch2
2023-04-18 07:35:59 -03:00
LOuroboros
43a5aa09ef
Corrections
...
-Optimized BattleScript_EffectTakeHeart
-Updated the checks for EFFECT_JUNGLE_HEALING and EFFECT_TAKE_HEART in AI_CheckBadMove
-Updated the code for MOVE_EFFECT_TRIPLE_ARROWS inside SetMoveEffect
2023-04-18 07:34:05 -03:00
Alex
60c88d8fcc
Update data/battle_scripts_1.s
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-04-17 19:12:39 +02:00
Alex
0531ab5d87
Fix Ability PopUp freeze
2023-04-17 18:47:54 +02:00
AgustinGDLV
d3a090020b
added code review
2023-04-15 15:30:07 -07:00
AgustinGDLV
82dc1e3e93
fixed dupe strings in battle item use
2023-04-15 09:27:28 -07:00
Eduardo Quezada
dacd0785db
Fixed Mega Evolution script name
2023-04-14 15:17:19 -04:00
AgustinGDLV
2eabcea86e
Battle Item Refactor ( #2902 )
...
* items that can be used in battle now use battlescripts
* removed ExecuteTableBasedItemEffect_
* taught AI how to use items, removed AI_itemtype/flag
* X-Items store stages raised in holdEffectParam
* USE_ITEM in tests
2023-04-14 19:25:50 +01:00
Eduardo Quezada
11beec62ee
Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange
...
# Conflicts:
# src/data/pokemon/evolution.h
# src/field_poison.c
2023-04-14 11:31:02 -04:00
Eduardo Quezada
7c29a24110
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretsync20230413
2023-04-13 17:05:48 -04:00
AgustinGDLV
86242c1c70
MOVE_REVIVAL_BLESSING Effect ( #2883 )
...
* implemented Revival Blessing
2023-04-12 01:14:25 +01:00
AgustinGDLV
d9ab2d1976
combined TerrainSeed and TerrainAbility loops + added terrain tests
2023-04-03 18:53:34 -07:00
AgustinGDLV
f292fefca3
fixed bad switchinabilities call in TerrainSeedLoop
2023-04-03 09:18:47 -07:00
LOuroboros
5bde98741a
Completed Take Heart's effect
...
It was missing its "heals any status condition" effect because I'm dumb and I forgot to actually go and do it.
2023-03-29 00:23:46 -03:00
ghoulslash
afc4b4cdee
add mirror herb
2023-03-28 15:07:37 -04:00
LOuroboros
ed9e860400
Post cherrypick corrections and improvements
...
-Made BattleScript_EffectTakeHeart use modifybattlerstatstage
-Optimized usage of BattleScript_EffectInfernalParade
-Tweaked the way in which Triple Arrows' increased crit. hit chance is handled
-Optimized syntax for case MOVE_EFFECT_TRIPLE_ARROWS in SetMoveEffect
-Optimized case EFFECT_INFERNAL_PARADE in CalcMoveBasePower
-Infernal Parade is not known to interact with Comatose, so Eduardo and I will extrapolate that here
-Added AI conditionals for some of the effects
-Made Triage notice Jungle Healing and moves that use its effect
2023-03-28 10:08:52 -03:00
AgustinGDLV
2017bee3f8
fixed Castform + Cherrim
2023-03-27 11:35:23 -07:00
Eduardo Quezada
3888b10769
Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange
...
# Conflicts:
# src/data/pokemon/form_change_table_pointers.h
# src/data/pokemon/form_change_tables.h
2023-03-27 10:55:38 -03:00
LOuroboros
000077f671
Implemented Axe Kick's effect
2023-03-26 20:05:30 -03:00
LOuroboros
8ae57dc912
Implemented Take Heart's effect
2023-03-26 20:05:13 -03:00
LOuroboros
05a34edb7d
Implemented Infernal Parade's effect
2023-03-26 20:04:55 -03:00
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