ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-22 12:23:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,113 Commits 1 Branch 0 Tags
Commit Graph

4545 Commits

Author SHA1 Message Date
LOuroboros
f1c153e469 Merged FORM_ITEM_HOLD_ABILITY into FORM_ITEM_HOLD 
There was never a reason not to.
 2022-09-06 18:37:16 -03:00
LOuroboros
0b07f4a06e Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into zazaForms 2022-09-06 10:53:12 -03:00
LOuroboros
bb290d5ab0 Updates 
-Removed the pointless param1 setting in sXerneasFormChangeTable
-Updated the descriptions of Behemoth Blade and Behemoth Bash
-Added a new parameter to the struct FormChange
-Allowed FORM_BATTLE_BEGIN and FORM_BATTLE_END to replace a move through a new function called "TryToSetBattleFormChangeMoves".
-Added missing calls to "CalculateMonStats".
-Renamed BoxPokemon pointer in GetFormChangeTargetSpeciesBoxMon for consistency's sake
-Optimized check inside UndoFormChange (even though the plan is to get rid of that func entirely.)

Special thanks to Blecoutre who fixed my TryToSetBattleFormChangeMoves function. It just wasn't working correctly at all.
 2022-09-06 10:45:07 -03:00
Eduardo Quezada D'Ottone
59f1f10dec
Merge pull request #2260 from DizzyEggg/magic_bounce 
Fix Magic Bounce targets
 2022-09-01 19:56:15 -04:00
LOuroboros
c167e2c6cc Added Legends: Arceus' move data 2022-08-30 19:32:44 -03:00
DizzyEggg
7cb010d71e fix magic bounce conflicts and fix magic coat 2022-08-30 19:36:06 +02:00
LOuroboros
df88317a98 Introduced FORM_BATTLE form changes 
For species such as Xerneas and Zacian.
 2022-08-29 19:10:52 -03:00
ghoulslash
2cd01bd95d
Merge pull request #2239 from DizzyEggg/quash 
Quash
 2022-08-29 10:43:54 -04:00
Blackforest92
61c33f56a0 Updated to latest master branch + add PLA's data to teachable_learnsets.h 2022-08-29 21:01:31 +07:00
Eduardo Quezada D'Ottone
8ca2f949e3
Merge pull request #2233 from gruxor/tmhm_rework 
Reworked TMHM into expandable list format
 2022-08-29 04:20:45 -04:00
Eduardo Quezada
7c86bd5d08 Merge remote-tracking branch 'pret/master' into RHH_pretMerge20220826 
# Conflicts:
#	include/battle_interface.h
#	src/battle_anim_effects_1.c
#	src/battle_script_commands.c
#	src/field_specials.c
 2022-08-26 22:23:37 -04:00
Eduardo Quezada D'Ottone
bee36edd9c
Merge pull request #2173 from LOuroboros/yourAffection 
Implement affection-now-friendship mechanics
 2022-08-26 14:54:32 -04:00
GriffinR
0516f94837
Merge pull request #1753 from LOuroboros/GetLeadMonFriendshipScore 
Added constants for GetLeadMonFriendshipScore
 2022-08-26 14:52:10 -04:00
crater-git
f8fb4e8cf2 Renamed funcs, lists, etc. - Teach->Teachable 2022-08-26 14:48:06 -04:00
GriffinR
c5e873aa2b
Merge pull request #1742 from GriffinRichards/sound-pan 
Add missing usage of SOUND_PAN_*
 2022-08-26 14:47:24 -04:00
crater-git
b8a3cc2846 Consolidated funcs, renamed CanMonLearnMove 2022-08-26 11:07:08 -04:00
crater-git
54ee960970 Fixed Battle Frontier tutor move IDs 2022-08-26 10:12:11 -04:00
ghoulslash
ae2ff4c1d8
Merge pull request #2258 from AsparagusEduardo/RHH_enableBugfix 
Enable BUGFIX by default
 2022-08-26 09:56:19 -04:00
DizzyEggg
6331931ba3 Fix Magic Coat targets 2022-08-26 15:01:51 +02:00
Eduardo Quezada D'Ottone
399a0c9d6f
Merge pull request #2142 from AgustinGDLV/exp_candy 
Gen 8 EXP Candies
 2022-08-25 23:03:24 -04:00
Eduardo Quezada D'Ottone
6b414d9555
Apply suggestions from code review 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-08-25 22:40:19 -04:00
Eduardo Quezada
4c999b40b1 Enable BUGFIX by default 2022-08-25 22:35:33 -04:00
crater-git
ed02c4b425 Removed tutor move distinction, combined llists 2022-08-25 19:56:47 -04:00
AgustinGDLV
e204527f43 changed candy item parameters 2022-08-25 15:52:47 -07:00
LOuroboros
8bd7103b9d Even more review corrections 2022-08-25 17:32:12 -03:00
DizzyEggg
622a7f8141 merge with master 2022-08-25 22:10:59 +02:00
LOuroboros
2cf2c00b29 Updated friendship labels 2022-08-25 17:10:11 -03:00
ghoulslash
552d1f3d7b
Merge pull request #2237 from gruxor/compat_define 
Reworked branch defines into single compatibility define
 2022-08-25 15:36:01 -04:00
ghoulslash
15a368163d
Merge pull request #2247 from AsparagusEduardo/RHH_specialPic 
LoadSpecialPokePic adjustments
 2022-08-25 15:35:21 -04:00
ghoulslash
591bac25c4
Merge pull request #2243 from AsparagusEduardo/RHH_placeholderMoves 
Moves with EFFECT_PLACEHOLDER can't be used.
 2022-08-25 15:34:23 -04:00
LOuroboros
5dd143f19d Applied Blackforest's changes to General_AffectionHangedOn 2022-08-25 13:07:52 -03:00
LOuroboros
1fc63c3431 More review corrections 2022-08-25 11:52:21 -03:00
DizzyEggg
a0ec8a5a80 4 digit hp in battle 2022-08-25 16:40:56 +02:00
LOuroboros
11d6ae4820 Renamed the GetLeadMonFriendshipScore constants 2022-08-25 11:34:37 -03:00
LOuroboros
e792fae415 Review corrections 
-Simplified the affection mechanics' battle scripts.
-Corrected the value seting inside CalcCritChanceStage.
-Simplified the checks inside Cmd_adjustdamage
-Simplified the contents of GetLeadMonFriendshipScore now that a more general function to do the same thing was added.
-Added constants for the values returned by GetMonFriendshipScore.
 2022-08-25 10:45:57 -03:00
LOuroboros
1f4ef2a0fb Added constants for GetLeadMonFriendshipScore 2022-08-25 10:40:56 -03:00
ghoulslash
f736766c94
Merge pull request #2238 from DizzyEggg/multi 
Wild multi battles and doubles 2 vs 1 interface
 2022-08-25 08:47:02 -04:00
Eduardo Quezada
af137c9b9d Multiple changes 
- Simplified LoadSpecialPokePic
- Changed all checks flag checks to houldShowFemaleDifferences
 2022-08-25 03:42:41 -04:00
LOuroboros
7b7ba93d45 Fixed P_UPDATED_ABILITIES's comment 2022-08-24 20:35:13 -03:00
crater-git
6012731f27 Removed redundant ifdef 2022-08-24 19:31:55 -04:00
DizzyEggg
91b76e2e4f quash pr clean up 2022-08-24 23:39:34 +02:00
DizzyEggg
06b4548603 Merge branch 'SonikkuA-DatH-Quashh' of https://github.com/SonikkuA-DatH/pokeemerald-expansion into quash 2022-08-24 23:35:42 +02:00
DizzyEggg
7aa55f2753 better interface 1 player mon in double 2022-08-24 23:00:21 +02:00
crater-git
940f9f1726 Moved branch defs to config.h, now only for compat 2022-08-24 16:10:32 -04:00
DizzyEggg
e3ab439ec0 Fix multi wild battles 2022-08-24 21:56:24 +02:00
Blackforest92
07a07ddc8d Update to latest master branch + allow Reveal Glass to work with Enamorus 2022-08-24 15:00:48 +07:00
Eduardo Quezada
eea718cfc6 Placeholder moves can't be used in battle. 2022-08-24 00:30:49 -04:00
Eduardo Quezada
56a2e91518 Updated move limitations 2022-08-23 22:40:04 -04:00
crater-git
45511fcc44 Reworked TMHM into expandable list format 2022-08-23 21:44:42 -04:00
Eduardo Quezada
7c7887aa65 Moved ABILITY_NAME_LENGTH back to include/constants/global.h to keep in line with upstream pret 2022-08-23 08:25:27 -04:00