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

2745 Commits

Author SHA1 Message Date
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
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
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
AgustinGDLV
7c853ef45e implemented G-Max Sweetness, Overgrowth, One Blow, Rapid Flow, and Finale 2023-02-28 16:37:48 -08:00
DizzyEggg
12db276a71 fix endif 2023-02-28 10:36:11 +01:00
DizzyEggg
1fb2560f7b newline 2023-02-28 10:14:16 +01:00
DizzyEggg
9d1e31ab39 accidentally removed ifs 2023-02-28 10:12:50 +01:00
DizzyEggg
cc2778b8bb some touches 2023-02-28 10:08:31 +01:00
Eduardo Quezada
90021f3be6 Removed zMovePower field in gBattleMoves in favor of a function. 2023-02-27 23:49:43 -03:00
AgustinGDLV
689069005a bringing back gMaxMovePowers to temp. fix exceptions 2023-02-27 15:18:33 -08:00
AgustinGDLV
ad54b0d392 changed max move power calc from table to formula 2023-02-27 15:02:56 -08:00
DizzyEggg
3159508603 fix dex size inaccuraccies 2023-02-27 23:08:54 +01:00
AgustinGDLV
05fe62cbab implemented G-Max Drum Solo, G-Max Hydrosnipe, G-Max Fireball 2023-02-27 12:11:52 -08:00
GriffinR
8d88a38561
Merge pull request #1854 from GriffinRichards/constants-num-frames 
Add MAX_MON_PIC_FRAMES, and trainer pic size constants
 2023-02-27 13:16:49 -05: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
Eduardo Quezada
41bf9ea63c Removed trailing whitespaces 2023-02-26 18:43:15 -03:00
BuffelSaft
deb3109c81
Use proper symbol name styles for Jangmo-o family (#2739) 2023-02-26 13:15:53 +13:00
AgustinGDLV
b4ec273353
Merge branch 'upcoming' into dynamax 2023-02-25 14:04:55 -08: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
Eduardo Quezada
ca81d7a0f9 Forgot about Jangmo-o 2023-02-24 21:58:09 -03:00
Eduardo Quezada
bbefee6bd4 Use proper symbol styles for Hakamo-O and Kommo-O 2023-02-24 15:22:58 -03:00
Alex
48391d8eff Basculegion female form 2023-02-24 08:46:34 +01: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
AgustinGDLV
38f462551f pulled rhh master, i hate merge conflicts 2023-02-22 18:50:54 -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
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
AgustinGDLV
87a9150134 added base functionality for max moves 2023-02-21 20:16:25 -08: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
LOuroboros
c33cc834bc
Updated Psyshield Bash's accuracy 2023-02-19 19:04:36 -03:00
ghoulslash
4b64433816
Add Battle Anim cmds for dynamic Task, Sprite creation + Misc. Anim Fixes (#2649) 
* add createvisualtaskontargets, createspriteontargets to fix electroweb, fiery wrath anims

* add missing semicolon

* add Cmd_createspriteontargets_onpos for heal block, fix heal block targeting

* remove duplicate func

* improve origin pulse anim

* fix IsDoubleBattle call

* venom drench acid uses average battler positions

* add GetSubpriorityForMoveAnim

* add GetBattleAnimMoveTargets for CreateSpriteOnTargets and Cmd_createvisualtaskontargets

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-02-19 11:48:12 +01:00
DizzyEggg
56c9564e7a
8th gen Howl's effect (#2700) 
* Howl gen8 effect
 2023-02-17 10:28:46 +00:00
Eduardo Quezada D'Ottone
625a7622e2
Merge pull request #2697 from AsparagusEduardo/RHH/sync/pret_20230214 
It's ya boi, pret merge! (pret merge 2023/02/16)
 2023-02-16 21:57:41 -03:00
Eduardo Quezada
f4f8ab6ee9 Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 2023-02-16 17:06:49 -03:00
DizzyEggg
94651e77a5 Fix Clang Scales target and effect 2023-02-15 22:18:18 +01:00