Commit graph

12520 commits

Author SHA1 Message Date
Eduardo Quezada
4e2e3b5e1f Refactored Max Move power to be based on effect 2023-03-25 02:04:07 -03:00
Eduardo Quezada
bbff30d042 Tabs to spaces 2023-03-24 23:44:04 -03:00
AgustinGDLV
7988c53d01 compile fix + placeholder animations (Wyrmwind broken?) 2023-03-23 22:27:26 -07:00
AgustinGDLV
2b86044013 goodbye gMaxMovePowers table 2023-03-23 21:53:24 -07:00
AgustinGDLV
6dc3c7a143 level reappears in healthbox and form reversion occurs correctly when Dynamax ends 2023-03-23 21:27:45 -07:00
AgustinGDLV
40102fe418 added check for AI to use Dynamax on last pokemon 2023-03-23 21:20:35 -07:00
AgustinGDLV
038649594a finished G-Max Move tests 2023-03-22 22:31:08 -07:00
AgustinGDLV
019b39c7ad Disable, Heal Block, Torment, and Imprison don't prevent move selection 2023-03-22 20:23:47 -07:00
AgustinGDLV
a3c8b97a6c added tests for status1/status2 effects + bug fixes for them 2023-03-22 20:18:25 -07:00
AgustinGDLV
6233627a57 more tests + fixed hp reversion issues 2023-03-22 17:04:05 -07:00
AgustinGDLV
788642347b added HP-based damage/healing interactions with Dynamax Pokemon 2023-03-21 11:36:04 -07:00
AgustinGDLV
69fd63a922 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax 2023-03-21 09:56:58 -07:00
AgustinGDLV
4ceb61b1dd updated Gigantamax form changing + tests 2023-03-20 21:50:55 -07:00
AgustinGDLV
5a9e1de836 Merge branch 'RHH/pr/feature/formBattleChange' of https://github.com/AsparagusEduardo/pokeemerald into dynamax 2023-03-20 21:14:33 -07:00
AgustinGDLV
7d70222770 added most Dynamax immunities/interactions + tests + fixed some move selection bugs 2023-03-20 16:40:05 -07:00
Eduardo Quezada D'Ottone
763cf488a0
pret merge 2023/03/19 (#2841) 2023-03-19 22:01:34 -03:00
Eduardo Quezada
47b4e6095d Undo Timburr and Stunfisk friendships, as they don't change 2023-03-19 22:00:18 -03: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
Eduardo Quezada
bef5d98b88 Fixed Pokémon fainting in the Overworld that don't have that specific form change entry 2023-03-18 09:47:54 -03:00
Eduardo Quezada D'Ottone
509da952ff
Added Psyblade and Hydro Steam (#2834) 2023-03-17 09:36:14 -03:00
LOuroboros
f4e8389779 Added Psyblade and Hydro Steam 2023-03-17 09:25:39 -03:00
GriffinR
00e211a417
Merge pull request #1873 from AsparagusEduardo/pret/pr2/stringConversionIDE
Changed IDE macros to allow their use in compound literals without IDE errors
2023-03-15 03:00:01 -04:00
GriffinR
02a37830cc
Merge pull request #1872 from AsparagusEduardo/pret/pr2/friendship
Added STANDARD_FRIENDSHIP constant to allow easier custom adjustments
2023-03-15 02:52:45 -04:00
Eduardo Quezada
2cb54c49da Changed definitions of string conversion IDE macros to allow their use in compound literals without IDE errors 2023-03-14 15:38:18 -03:00
Eduardo Quezada D'Ottone
d91d550341
Fixes some hisuian sprites (#2829) 2023-03-14 14:46:30 -03:00
Alex
66c63ee458 hisuian sprite fixes 2023-03-14 18:23:50 +01:00
Eduardo Quezada
0dfb60f2e4 Removed uneeded parameters 2023-03-14 11:07:26 -03:00
Eduardo Quezada
0a9ab96390 Added STANDARD_FRIENDSHIP constant to allow easier custom adjustments 2023-03-14 08:54:49 -03:00
AgustinGDLV
4c28b6384f added first set of Dynamax tests 2023-03-13 21:24:14 -07:00
Eduardo Quezada D'Ottone
26015be305
Add missing Hisuian sprites and cries (#2725) 2023-03-13 14:50:42 -03:00
Alex
f3810465e8 samurott shiny.pal v2 2023-03-13 17:46:52 +01:00
Alex
59d5f078d2 samurott shiny.pal 2023-03-13 17:44:25 +01:00
Alex
aa29eced1f
Merge branch 'rh-hideout:upcoming' into PLA_missing_sprites 2023-03-13 17:46:53 +01:00
Eduardo Quezada D'Ottone
a8c9309458
Fixed Wring Out's power (#2824)
Fixes #2823
2023-03-13 09:07:29 +01:00
AgustinGDLV
ca75fcb50c added some 'test' tests 2023-03-12 15:28:34 -07:00
Eduardo Quezada
a101476d51 Hunger Switch test 2023-03-12 17:01:53 -03:00
Eduardo Quezada
a0feaabef1 Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 2023-03-12 15:53:32 -03:00
Eduardo Quezada
c46e70ca82 Forgot about Primal Reversion 2023-03-12 02:38:27 -03:00
Eduardo Quezada
7ce68994ec Made Mega Evolution properly use TryBattleFormChange 2023-03-12 02:32:09 -03:00
AgustinGDLV
d0dc564da8 actually fixed it 2023-03-11 11:17:11 -08:00
AgustinGDLV
f679c4195b fixed redundancy in g-max form change 2023-03-11 11:12:05 -08:00
AgustinGDLV
c823e19705 implemented Gigantamax form change 2023-03-11 10:48:21 -08:00
AgustinGDLV
89e778225c dynamax indicator shares palette with alpha/omega 2023-03-11 10:47:23 -08:00
AgustinGDLV
b708da3998 Merge branch 'RHH/pr/feature/formBattleChange' of https://github.com/AsparagusEduardo/pokeemerald into dynamax 2023-03-11 00:17:30 -08:00
AgustinGDLV
28ffffac2f fixed typo with HP multiplier 2023-03-10 23:15:02 -08:00
AgustinGDLV
4293dc8a24 not entirely confident implementation of Dynamax indicator 2023-03-10 23:03:51 -08:00
AgustinGDLV
317b52f3f6 added Dynamax trigger sprite 2023-03-10 22:05:23 -08:00
AgustinGDLV
06151cf051 Max Guard actually protects / Max Moves bypass protect 2023-03-10 21:35:19 -08:00
AgustinGDLV
ec4b330b9b Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax 2023-03-10 21:00:41 -08:00
AgustinGDLV
06bf934b02 Dynamaxed pokemon now have increased HP 2023-03-10 20:38:17 -08:00