Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,937 Commits 1 Branch 0 Tags
Commit Graph

2310 Commits

Author SHA1 Message Date
Bassoonian
d5b36c7c60
Reusable TMs (#2903) 
* Reusable TMs
* Forgot about Gen9 making TMs expendable again
* Change importance check based on Alex's suggestion
* Prevent items with importance from being bought more than once
* Change importance check to ghoul's suggestion
* Update include/config/item.h
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-04-18 19:52:20 -04:00
Frank DeBlasio
9d93af2261
Fixed Budew evolution method (#2928) 2023-04-18 16:28:02 -04: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
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
AgustinGDLV
86242c1c70
MOVE_REVIVAL_BLESSING Effect (#2883) 
* implemented Revival Blessing
 2023-04-12 01:14:25 +01:00
aaghaht
bd54c70020 Add PLA evo items 2023-04-10 10:47:31 +05:30
Bassoonian
02af4d0943 Fixes Ominous Wind targeting 2023-04-08 18:53:04 +02: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
504ec36b2b Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax 2023-03-27 16:22:11 -07: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
d2a221eb85 Corrected Lunar Blessing's data 2023-03-26 20:04:56 -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
AgustinGDLV
5d508f7963 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax 2023-03-24 22:40:51 -07:00
AgustinGDLV
2b86044013 goodbye gMaxMovePowers table 2023-03-23 21:53:24 -07:00
Bassoonian
cd6d71cd01 Add most of the new item icons (Clear Amulet & Shards missing) 2023-03-24 00:50:06 +01:00
Bassoonian
e601719c91 Add new PLA form change items 2023-03-24 00:04:08 +01:00
Bassoonian
f15fb1540f Allow Kubfu evolution with Scroll items 2023-03-23 23:16:08 +01:00
Bassoonian
80d0efae0c Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhhupcomingdev 2023-03-23 23:04:23 +01: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
Eduardo Quezada D'Ottone
2658fe32c2
Removed ITEM_HAS_EFFECT (#2840) 2023-03-23 10:02:32 +01:00
Eduardo Quezada
ef914a2fac Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 2023-03-21 16:13:27 -03: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
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
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
Bassoonian
d480fc90f2 Fix Scrolls type 2023-03-19 21:21:43 +01:00
Bassoonian
372c6a1afa Add new item variables and defines 2023-03-19 20:55:39 +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
0a9ab96390 Added STANDARD_FRIENDSHIP constant to allow easier custom adjustments 2023-03-14 08:54:49 -03: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
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
AgustinGDLV
c823e19705 implemented Gigantamax form change 2023-03-11 10:48:21 -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
ec4b330b9b Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax 2023-03-10 21:00:41 -08: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
13ca2271e2
Add meltan and melmetal teachable moves (#2732) 2023-03-07 10:25:05 -03: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
Alex
58b408cbbf some new sprites 2023-03-02 17:04:24 +01:00
ghoulslash
ad6495980f
Partially fix dex size inconsistencies (#2799) 2023-03-02 09:35:32 -05:00
Alex
487e26e700 fix enamorus_t + samuroutt sprite + conflicts 2023-03-02 11:05:59 +01:00