ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-29 05:40:41 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,738 Commits 1 Branch 0 Tags 235 MiB
c530eb2445
Commit Graph

996 Commits

Author SHA1 Message Date
Eduardo Quezada D'Ottone
c530eb2445
Add mirror herb (#2873) 2023-05-06 21:20:37 -04:00
Alex
957ee36c75
Fix for Ceaseless Edge/Axe Kick visual glitch (#2969) 2023-05-02 17:25:44 -04:00
Shae
ae2d5f7d1e
Weather related Ability tests, fix for Leaf Guard not preventing Rest. (#2957) 2023-05-02 14:08:05 -04: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
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
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
LOuroboros
a128192bfe Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate 2023-04-24 09:36:09 -03: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
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
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
Eduardo Quezada
dacd0785db Fixed Mega Evolution script name 2023-04-14 15:17:19 -04: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
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
ghoulslash
afc4b4cdee add mirror herb 2023-03-28 15:07:37 -04: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
ghoulslash
6574e01e73
Gen. 9 Move Effects, 1st batch (#2534) 2023-03-26 16:20:47 -04: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
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
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
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
ghoulslash
dec1b16138
Swallow/Spit Up Gen 5 Behavior and tests for Swallow/Spit Up/Stockpile (#2790) 2023-03-05 09:50:47 -05: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
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
LOuroboros
fe09f3e0d3 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate 2023-02-26 23:42:01 -03:00