12991 Commits

Author SHA1 Message Date
DizzyEggg
5a745020ee add tests for stockpile swallow spit up 2023-02-27 16:27:58 +01:00
DizzyEggg
3338a6b786 add messages for stockpile effects wear off 2023-02-27 12:31:29 +01:00
LOuroboros
8a036e6007 Made this build again 2023-02-27 07:51:36 -03:00
LOuroboros
a54a8d9b2a Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate 2023-02-27 07:43:19 -03:00
DizzyEggg
468625ed1d fit long z-moves names on battle textbox 2023-02-27 10:32:45 +01:00
AgustinGDLV
e537be76ea
Z-moves bypass protection (#2730) 2023-02-27 09:17:07 +01:00
DizzyEggg
919fb184fe
AI knows how to handle Illusion (#2726)
* AI knows how to handle Illusion
2023-02-27 09:12:52 +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
AgustinGDLV
a36c35aea1 implemented G-Max Vine Lash, G-Max Wildfire, G-Max Cannonade, G-Max Volcalith 2023-02-26 23:35:36 -08:00
AgustinGDLV
4d19659b0b implemented G-Max Stonesurge, G-Max Steelsurge 2023-02-26 22:02:06 -08:00
LOuroboros
fe09f3e0d3 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate 2023-02-26 23:42:01 -03:00
Ariel A
829427a4b7 Merge branch 'followers-expanded-id' into lighting-expanded-id 2023-02-26 18:37:00 -05:00
Ariel A
2c922adbf9 Merge branch 'followers' into followers-expanded-id 2023-02-26 18:34:35 -05:00
Eduardo Quezada
41bf9ea63c Removed trailing whitespaces 2023-02-26 18:43:15 -03:00
DizzyEggg
4bdca43dbd refactor mega evolution indicator sprite 2023-02-26 12:51:35 +01:00
BuffelSaft
deb3109c81
Use proper symbol name styles for Jangmo-o family (#2739) 2023-02-26 13:15:53 +13:00
AgustinGDLV
503aad9137 fixed tests 2023-02-25 15:57:57 -08:00
AgustinGDLV
b4ec273353
Merge branch 'upcoming' into dynamax 2023-02-25 14:04:55 -08:00
Eduardo Quezada D'Ottone
abc0e20aaf
Consider Nature Power in AI_CalcDamage (#2776) 2023-02-25 12:30:53 -03:00
Alex
f249b58c01 fix style 2023-02-25 15:24:31 +01:00
Alex
7ea82820ec Consider nature power in AI_CalcDamage 2023-02-25 15:07:45 +01:00
Eduardo Quezada
31ab56bceb Fixed footprint symbol names. 2023-02-25 09:23:34 -03:00
Alex
df47312e32 Fix move to battle_util.c 2023-02-25 12:38:57 +01:00
Alex
fc5c93fd83 exclude status move type check 2023-02-25 12:15:40 +01:00
Eduardo Quezada
ca81d7a0f9 Forgot about Jangmo-o 2023-02-24 21:58:09 -03:00
Alex
1e1686b69a Fixes #2414 2023-02-24 23:38:23 +01:00
Eduardo Quezada
bbefee6bd4 Use proper symbol styles for Hakamo-O and Kommo-O 2023-02-24 15:22:58 -03:00
Eduardo Quezada
079ca8ab29 Renamed MON_DATA_SPECIES2 to MON_DATA_SPECIES_OR_EGG for clarification 2023-02-24 07:53:02 -03:00
Alex
48391d8eff Basculegion female form 2023-02-24 08:46:34 +01: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
Alex
a870ec3c22 enamorus_t cry, basculegionf sprite, new typhlosion back sprite 2023-02-23 15:20:12 +01:00
DizzyEggg
3ff8c95c4e add meltan melmetal teachable moves 2023-02-23 10:53:55 +01:00
DizzyEggg
23272074bf fix uninitialized ai modifier variable in ai calc damage 2023-02-23 10:25:53 +01:00
AgustinGDLV
38f462551f pulled rhh master, i hate merge conflicts 2023-02-22 18:50:54 -08:00
AgustinGDLV
07fd952d52 implemented max move functionality for dynamic type moves 2023-02-22 14:35:41 -08:00
AgustinGDLV
d69de9fb17 added longer 'used move' messages for max moves 2023-02-22 14:18:15 -08:00
Alex
1c832768bb fix trainer party 2023-02-22 20:44:03 +01:00
Alex
1f694ae7ed missing pla sprites 2023-02-22 20:41:01 +01:00
DizzyEggg
877e3fd6af merge with upcoming 2023-02-22 19:27:42 +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
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
bca47a0891
Update src/battle_script_commands.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2023-02-22 09:17:23 +01:00
AgustinGDLV
87a9150134 added base functionality for max moves 2023-02-21 20:16:25 -08: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
DizzyEggg
61064ab07e Merge branch 'upcoming' into fix_abilities_empty_field 2023-02-21 16:22:26 +01: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