ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,532 Commits 1 Branch 0 Tags 235 MiB
0124c910aa
Commit Graph

2434 Commits

Author SHA1 Message Date
ghoulslash
f97ec1975a merge w upcoming 2023-01-23 09:24:03 -05:00
GriffinR
29c1af50ca Fix Best Streak stat name 2023-01-20 11:25:04 -05:00
Eduardo Quezada
749225ace1 Matching merge from upstream pret 
# Conflicts:
#	graphics/interface/menu_info.png
#	include/pokemon.h
#	src/battle_ai_switch_items.c
#	src/battle_anim_mons.c
#	src/battle_anim_water.c
#	src/battle_controller_opponent.c
#	src/battle_gfx_sfx_util.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
#	src/pokemon_summary_screen.c
 2023-01-20 12:31:54 -03:00
GriffinR
0851e55ccb
Merge pull request #1657 from PikalaxALT/sync_battle_anim_args 
Sync battle anim args
 2023-01-18 12:16:49 -05:00
GriffinR
b7d92e8537 Revert incorrect constant usage, add new correct ones 2023-01-18 12:11:09 -05:00
GriffinR
d1e4bd44ce Correct comment in maps.h 2023-01-18 11:54:06 -05:00
GriffinR
5a906c33ac
Merge branch 'master' into sync_battle_anim_args 2023-01-18 11:47:33 -05:00
GriffinR
d68e81c2be Clarify MB_SEMI_DEEP_WATER name 2023-01-17 21:32:55 -05:00
LOuroboros
773e7f0de2 Fixed Explosion & Intimidate's 'interaction' 2023-01-17 22:16:42 -03:00
Eduardo Quezada
70d59d6aa9 Improve Easy Chat documentation 2023-01-15 02:15:11 -03:00
Eduardo Quezada
ac4825ad28 Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	src/battle_util.c
 2023-01-13 11:50:47 -03:00
GriffinR
b873d69679 Sync trade anim 2023-01-09 15:32:04 -05:00
ghoulslash
cc7c546011
Merge pull request #2473 from LOuroboros/mimicry 
Reimplemented Mimicry
 2023-01-09 12:54:44 -05:00
Eduardo Quezada
911541ba4f Merge branch 'RHH/upcoming' into RHH/pr/feature/IncenseBaby 
# Conflicts:
#	include/config/pokemon.h
 2023-01-08 18:48:01 -03:00
ghoulslash
da27df9f18
Merge pull request #2326 from AsparagusEduardo/RHH/pr/reworkScald 
Rolled EFFECT_SCALD into EFFECT_BURN_HIT with a config for its Gen6+ change
 2023-01-08 16:25:29 -05:00
Eduardo Quezada D'Ottone
7622d84a4f
Revert "Removed Unown hack" 2023-01-07 11:39:56 -03:00
Eduardo Quezada
d72a3731d4 Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald 
# Conflicts:
#	include/constants/battle_move_effects.h
 2023-01-06 15:25:49 -03:00
LOuroboros
72566e6323 Turned Stone Axe's and Ceaseless Edge's effects into MOVE_EFFECTs 2023-01-05 03:02:56 -03:00
Eduardo Quezada
74d8c587fe Merge branch 'RHH/upcoming' into RHH/pr/cleanup/unown 
# Conflicts:
#	src/data/pokemon/species_info.h
#	src/data/pokemon_graphics/front_pic_anims.h
 2023-01-04 17:58:54 -03:00
GriffinR
36c89d345c
Merge branch 'master' into doc-wnews 2023-01-03 22:28:21 -05:00
Eduardo Quezada
e0802f13a2 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20230103 
# Conflicts:
#	include/link_rfu.h
 2023-01-03 15:40:33 -03:00
LOuroboros
f1ca254c28 Updated the Mimicry reimplementation 
Mimicry is now a proud member of ABILITYEFFECT_ON_TERRAIN.

Misc. changes:
-Ditched the dependency on and usage of gBattlerAttacker for the effects inside ABILITYEFFECT_ON_WEATHER and ABILITYEFFECT_ON_TERRAIN.
-Made Cmd_switchineffects activate ABILITYEFFECT_ON_TERRAIN to take into account overworld weather-induced field terrains.
-Updated the text strings printed by the battle scripts inside the aforementioned AbilityBattleEffects caseIDs.
-Removed constant label of unused VARIOUS_TRY_TO_APPLY_MIMICRY which I forgot about.
-Updated ChangeTypeBasedOnTerrain, partly as a result of the aforementioned changes but also for optimization purposes.
 -There was never a reason to establish an empty scope, or to use GET_MOVE_TYPE and the variables that complemented it.
-Removed case ABILITY_QUARK_DRIVE from AbilityBattleEffects' case ABILITYEFFECT_ON_SWITCHIN.
 2023-01-03 02:27:41 -03:00
LOuroboros
d0f5653f5e Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry 2023-01-02 19:00:41 -03:00
Eduardo Quezada
a23501a4a3 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	src/battle_script_commands.c
 2023-01-02 18:54:57 -03:00
LOuroboros
0a00942a26 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1 2023-01-02 16:00:13 -03:00
LOuroboros
13d8c0d167 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities 2023-01-02 14:34:24 -03:00
LOuroboros
ca32d43433 Streamlined ability-on-weather changes 
Also renamed activateweatherabilities and activateterrainabilities.
 2023-01-02 14:32:56 -03:00
Eduardo Quezada
16e8a5dd7f Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	include/battle_util.h
 2023-01-01 16:02:40 -03:00
LOuroboros
e8dfb66c30 Adding ability effect triggers for terrains and weather 
A new, probably better way to handle the announcement trigger that abilities such as Protosynthesis and Quark Drive have, when the battle weather or the field terrain change.

Misc. changes:
-EFFECT_DAMAGE_SET_TERRAIN -> EFFECT_HIT_SET_REMOVE_TERRAIN
 -It's more appropriate as the effect can be used to force set a terrain or simply to remove an active terrain, after all.
 -The main reason for the rename was the inconsistency with the battle script's label.
-Reverted accidentally committed change to B_DOUBLE_WILD_CHANCE, performed back in c8abf00c.
 2022-12-30 03:25:16 -03:00
LOuroboros
0159065dea Removed Shell Trap 
It's time to let it go for my own mental sanity.
Besides, it's a Gen. 7 move. I shouldn't have added it here.
 2022-12-28 07:51:11 -03:00
Eduardo Quezada D'Ottone
b5b7631be7 Added guards to form_change_types.h 2022-12-26 09:14:28 -03:00
Eduardo Quezada
28cffda9d4 Hatch level config 2022-12-22 10:38:54 -03:00
LOuroboros
4bb86c5d96 Implemented Barb Barrage's effect 2022-12-21 19:48:50 -03:00
LOuroboros
1229fa752a Fixed Triple Axe's target, added its effect and fixed Ceaseless Edge's 2022-12-21 19:48:49 -03:00
LOuroboros
2cb9400ef0 Implemented Dire Claw's effect 2022-12-21 19:48:48 -03:00
LOuroboros
3ce4869766 Implemented Shell Trap's effect 2022-12-21 19:48:10 -03:00
LOuroboros
ae482ed1f4 Implemented Ceaseless Edge's effect 2022-12-21 19:47:00 -03:00
Eduardo Quezada
c0d4e14a61 Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald 
# Conflicts:
#	include/config/battle.h
#	include/constants/battle_move_effects.h
 2022-12-21 12:46:09 -03:00
LOuroboros
d943f891c5 Applied Wind Power and Wind Rider correction 
-Renamed TryActivateWindRiderLoop to BattleScript_TryTailwindAbilitiesLoop
-Modified how it handles the check for Wind Rider by using a various and incorporated Wind Power into the mix because that ability is affected by Tailwind as well.
 2022-12-21 10:08:16 -03:00
SonikkuA-DatH
2c28076696
Update include/constants/battle_script_commands.h 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-12-20 18:08:38 -08:00
LOuroboros
6153b8e904 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities 2022-12-20 07:11:36 -03:00
SonikkuA-DatH
f6fab92ac8
Merge branch 'upcoming' into SonikkuA-DatH-Teatime2 2022-12-19 15:52:20 -08:00
Eduardo Quezada
1580f892a5 Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	include/constants/pokemon.h
#	src/battle_script_commands.c
 2022-12-19 18:53:26 -03:00
SonikkuA-DatH
ffda816507
Update battle_script_commands.h 
Whoops, forgot the to copy paste various
 2022-12-18 22:41:15 -08:00
SonikkuA-DatH
f0aee1f8d3
Merge branch 'upcoming' into SonikkuA-DatH-Teatime2 2022-12-18 17:50:39 -08:00
GriffinR
2aa6a9c164 Remove two unreferenced metatile labels 2022-12-16 11:05:56 -05:00
GriffinR
347a02ace1 Sync trade 2022-12-15 15:40:59 -05:00
LOuroboros
4c9446ed0a Fixed Speed Swap's effect 2022-12-14 12:00:45 -03:00
LOuroboros
6ef30da492
Update battle.h 2022-12-13 02:44:49 -03:00
LOuroboros
a56cfd1aa7 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities 2022-12-12 19:55:48 -03:00
ghoulslash
340278c83b
Merge pull request #2452 from LOuroboros/intimidate 
Optimized Intimidate's code
 2022-12-11 22:04:16 -05:00
ghoulslash
e3e0d60222
Merge pull request #2467 from Bassoonian/gen9moves 
Generation IX Moves
 2022-12-11 14:47:47 -05:00
LOuroboros
0d1f9d9613 Reimplemented Mimicry 2022-12-09 20:46:18 -03:00
ghoulslash
6d28882e44 start gen9 hold effects 2022-12-06 09:48:36 -05:00
LOuroboros
7a52404fd3 Implemented Supreme Overlord's effect 2022-12-06 05:23:30 -03:00
LOuroboros
3c30e6bdc3 Implemented Sharpness' effect 2022-12-06 05:23:30 -03:00
LOuroboros
24465858a7 Implemented the 4 Ruin Abilities 2022-12-06 05:23:29 -03:00
LOuroboros
e25f843db3 Implemented Quark Drive's effect 
Also tweaked STRINGID_SUNLIGHTACTIVATEDABILITY and STRINGID_STATWASHEIGHTENED.
 2022-12-06 05:23:29 -03:00
LOuroboros
a328088122 Implemented Protosynthesis' effect 
Also turned GetHighestStatId into a global function since Protosynthesis' effect uses it.
 2022-12-06 05:23:29 -03:00
LOuroboros
88cae380d0 Implemented Wind Power's effect 2022-12-06 05:23:29 -03:00
LOuroboros
4dc44150c5 Implemented Wind Rider's effect 2022-12-06 05:23:29 -03:00
LOuroboros
653364fd71 Added the basic data for the Gen. 9 Abilities 2022-12-02 23:01:22 -03:00
Eduardo Quezada
9d1149c423 Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221124 
# Conflicts:
#	src/pokemon.c
 2022-11-29 17:40:09 -03:00
ghoulslash
34ba9b4e0d convert a few various to callnatives 2022-11-28 14:36:19 -05:00
Eduardo Quezada
4bac880042 Removed Unown hack 2022-11-25 16:55:53 -03:00
Eduardo Quezada
e858b4e709 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124 
# Conflicts:
#	include/battle.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_dome.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/battle_tower.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
 2022-11-24 15:36:00 -03:00
GriffinR
483c3d5c13 Document wonder news 2022-11-22 02:17:03 -05:00
GriffinR
5fa364256d
Merge pull request #1808 from AsparagusEduardo/pret/PR/numSides 
Introduce NUM_BATTLE_SIDES
 2022-11-18 17:39:00 -05:00
Bassoonian
739680e425 Victory Dance effect 2022-11-18 22:23:34 +01:00
Bassoonian
29ae22183b Mystical Power effect 2022-11-18 22:17:08 +01:00
Bassoonian
9512b3a57a Implement Double Shock functionality with temporary string 2022-11-18 22:12:26 +01:00
Bassoonian
3ac3cb249e Wicked Torque effect 2022-11-18 22:00:21 +01:00
Bassoonian
f7d1a12d2d Data entry for gen9 moves 2022-11-18 12:15:44 +01:00
Eduardo Quezada
540f4679bb Implemented uses of Shiny config 2022-11-14 11:56:02 -03:00
Eduardo Quezada
011ec16f1e Organized conffig files into their own folder and cleaned up 2022-11-14 11:03:49 -03:00
LOuroboros
31a602f3b6 Optimized Intimidate's code 2022-11-12 18:03:46 -03:00
Eduardo Quezada
f2d0e547ac Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221030 
# Conflicts:
#	src/rom_header_gf.c
 2022-11-09 19:54:44 -03:00
Eduardo Quezada
2ef2134be1 Moved Hunger Switch to form change table. 2022-11-06 17:12:34 -03:00
Eduardo Quezada
62912f8caf Battle indicator now depends on species instead of held item 
- This is to avoid a situation where a user would plop a Primal Groudon and its indicator would become Alpha if it doesn't have a Red Orb.
 2022-11-06 16:01:07 -03:00
Eduardo Quezada
57bdb683ec DoBurmyFormChange handled by FORM_CHANGE_END_BATTLE_TERRAIN 2022-11-05 23:27:40 -03:00
Eduardo Quezada
99536089cf Renamed form change defines to be consistant with which function calls which 2022-11-05 22:02:25 -03:00
Eduardo Quezada
8f289714b2 Moved form change defines and descriptions to their own header 2022-11-05 21:36:45 -03:00
Eduardo Quezada
ceb5c8a00a Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	include/battle_util.h
#	src/battle_util.c
 2022-11-05 20:11:33 -03:00
Eduardo Quezada
42f8e8c114 Multiple refactors 
- Added a general GetBattleFormChangeTargetSpecies instead of getting specific ones for Mega Evolution and Primal Reversion.
- Added FORM_CHANGE_BATTLE_HP_PERCENT, to replace ShouldChangeFormHpBased.
- Cleaned ifdefs for hold effects.
- Finally removed UndoMegaEvolution.
- FORM_CHANGE_FAINT and FORM_CHANGE_BATTLE_END restore to the first form before a battle form change if species isn't specified.
- When changing from a form with more HP to one with less, now current HP is kept to fix Zygarde edge case. (Will likely need to be reworked for Dynamax, as it behaves differently)
- Uses DoesSpeciesUseHoldItemToChangeForm in CanBattlerGetOrLoseItem.
 2022-11-05 20:00:12 -03:00
Eduardo Quezada
44bf4a15e3 Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald 
# Conflicts:
#	include/constants/battle_config.h
#	include/constants/battle_move_effects.h
 2022-11-04 12:19:40 -03:00
Eduardo Quezada
edf4e45c4d Config for Dark Void being only usable by Darkrai 2022-11-03 21:36:12 -03:00
Eduardo Quezada D'Ottone
b8371500d3
Merge pull request #1676 from BuffelSaft/multistrike 
Multi-hit refactor and Parental Bond
 2022-11-01 21:16:04 -03:00
ghoulslash
c6cb54b54e
Merge pull request #2319 from AsparagusEduardo/RHH/pr/Lures 
Implemented Lures and Repel/Lure "use another" menu
 2022-11-01 20:05:15 -04:00
Eduardo Quezada
797c5514d3 Mega Evolution in form change tables 2022-11-01 18:37:23 -03:00
Eduardo Quezada
a57f6d184b Fainting by poison in the overworld reverts forms 2022-11-01 12:24:04 -03:00
LOuroboros
5ebc996c51 Removed worthless DEBUG_FLAG_PC_FROM_DEBUG_MENU config 2022-10-30 22:03:14 -03:00
Eduardo Quezada
e4a439aa46 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 
# Conflicts:
#	src/data/bard_music/moves.h
#	src/data/bard_music/pokemon.h
 2022-10-30 12:30:38 -03:00
Eduardo Quezada
3172273c73 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/Lures 
# Conflicts:
#	src/pokemon.c
 2022-10-30 12:16:09 -03:00
GriffinR
c76beed989
Merge pull request #1807 from pret/porymap-5 
Update for Porymap 5.0.0
 2022-10-30 11:01:37 -04:00
BuffelSaft
224ca256ce Requested clean up 
Rename constants, remove white space, improve B_BEAT_UP description.

* Rename B_BEAT_UP_DMG to B_BEAT_UP
* Shorten B_PARENTAL_BOND_DAMAGE to B_PARENTAL_BOND_DMG
* Remove trailing whitespace
* Replace boolean 1 with TRUE in MOVEEND_MULTIHIT_MOVE
 2022-10-27 22:25:33 +13:00
BuffelSaft
3327758cdb Move B_BEAT_UP_DMG to other move settings 
This is more of a mechanical change like gen 8's change to Teleport, so it should go in the same block of settings.
 2022-10-26 23:29:09 +13:00
BuffelSaft
d9cc98a4fe Suggested changes 
- Various style fixes
- Add BATTLE_ALIVE_EXCEPT_ATTACKER case to CountAliveMonsInBattle
 2022-10-24 22:19:35 +13:00
BuffelSaft
a5ede1ee90 Move B_PARENTAL_BOND_DAMAGE to damage settings 
Title.
 2022-10-23 21:41:42 +13:00
BuffelSaft
9b076a9dcf Fix spread moves, tidy up CANCELLER_MULTIHIT_MOVES 
- Parental Bond spread moves should now strike twice whenever there is a single target, even if the target is the user's ally.
- Random chance to hit 2-5 times is now set in SetRandomMultiHitCounter().
 2022-10-23 21:40:04 +13:00
BuffelSaft
1b056f9044 Fix various Parental Bond issues 
- Dragon Tail and Circle Throw strike twice and then switch the target
- Z moves are unaffected by Parental Bond
- Renamed parentalBondOn to parentalBondState
- Added constants for possible values of parentalBondState
- Fixed broken stat change animations and removed unused MOVE_EFFECT_SKY_DROP
 2022-10-23 17:37:23 +13:00
BuffelSaft
3775c5d00c Fix move effects 
Restore unintentionally removed MOVEEND_DEFROST, fix move effect definitions.
 2022-10-22 18:54:25 +13:00
BuffelSaft
6035c5a280 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald into multistrike 2022-10-22 14:31:13 +13:00
Eduardo Quezada
0a79390ec0 Primal Reversion in Form Change tables 2022-10-21 02:08:37 -03:00
Eduardo Quezada
861590f747 Form change when fainting. Goodbye UndoFormChange! 2022-10-20 18:53:12 -03:00
Eduardo Quezada
d8cc7f7abe Form change when switching out 2022-10-20 17:56:56 -03:00
Eduardo Quezada
b74f0777da Renamed form change constants 2022-10-20 17:22:58 -03:00
Eduardo Quezada D'Ottone
18e7fc5efc Introduce NUM_BATTLE_SIDES 2022-10-20 08:41:18 -03:00
GriffinR
3e8baa5b04
Merge branch 'master' into porymap-5 2022-10-18 22:54:25 -04:00
GriffinR
a418f8d976
Merge pull request #1755 from GriffinRichards/map-dynamic 
Rename special map constants, treat warp ids as strings
 2022-10-18 22:45:56 -04:00
tustin2121
4730870646 VAR_RUN_TRIGGER_IMMEDIATELY -> TRIGGER_RUN_IMMEDIATELY 
Getting rid of the VAR_ prefix, to avoid the porymap problem.
 2022-10-18 21:12:31 -04:00
GriffinR
e33581ff9c
Merge pull request #1671 from sphericalice/heal-location-none 
Add the HEAL_LOCATION_NONE constant
 2022-10-18 18:41:04 -04:00
tustin2121
327c648e87 Document seldom-used trigger functionality 
Added a define for use in overworld triggers where the goal is to run the provided script in the immediate script context instead of the global one like normal. This is used in triggers in the desert, on faraway island, and a couple other places to do weather effects quickly and on the same frame. Suggestions for a better define name are welcome.
 2022-10-16 20:46:50 -04:00
Eduardo Quezada D'Ottone
4cbc6d4de1 Config for running indoors 2022-10-14 22:31:45 -03:00
LOuroboros
90f79999bb Added class-based Poké Balls for trainers 
Thanks to Ghoulslash for helping me optimizing things.
 2022-10-14 11:14:30 -03:00
GriffinR
60e1ad20e4 Add NUM_MON_PIC_FRAMES, and trainer pic size constants 2022-10-10 23:16:08 -04:00
ghoulslash
06bddbac23
Merge pull request #2379 from AsparagusEduardo/RHH/pr/pretmerge_20221007 
One for the go! (pret merge 2022/10/07)
 2022-10-07 17:14:00 -04:00
Eduardo Quezada
8ea060044a Battle text pauses config 2022-10-07 17:22:29 -03:00
Eduardo Quezada
453da8aa8c Moved ILLEGAL_BATTLE_TYPES to include\constants\battle.h and renamed it to BATTLE_TYPE_RECORDED_INVALID 2022-10-07 15:49:00 -03:00
Eduardo Quezada
77f24d42e4 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/reworkScald 
# Conflicts:
#	include/constants/battle_config.h
 2022-10-07 15:39:02 -03:00
Eduardo Quezada
68b474c0f0 Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20221007 
# Conflicts:
#	include/constants/items.h
#	src/battle_interface.c
 2022-10-07 14:52:32 -03:00
Eduardo Quezada
9b977486fe Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/pokemonConfig 
# Conflicts:
#	src/data/pokemon/base_stats.h
 2022-10-07 14:05:45 -03:00
ghoulslash
441586f23f
Merge pull request #2293 from AsparagusEduardo/RHH/pr/pokemonFlags 
4 new species flags
 2022-10-07 10:55:43 -04:00
ghoulslash
923046c993
Merge pull request #2359 from AsparagusEduardo/RHH/pr/pretmerge_20220925 
I don't have any Sunday memes (pret merge 2022-09-25)
 2022-10-07 10:25:59 -04:00
GriffinR
e293986fbb
Merge pull request #1793 from GriffinRichards/clean-shop 
Clean up shop.c
 2022-10-06 17:24:53 -04:00
Eduardo Quezada
fb9105f8ac Added Mega Evolution flag 2022-09-27 10:21:26 -03:00
Eduardo Quezada
3d214f8204 Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/pokemonFlags 
# Conflicts:
#	src/pokemon.c
 2022-09-27 10:13:32 -03:00
Eduardo Quezada
dfdfb72365 Separate config for updated move types 2022-09-26 07:50:43 -03:00
Eduardo Quezada
f969effd36 Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925 2022-09-25 12:51:39 -03:00
Eduardo Quezada D'Ottone
17c8842ad4
Merge branch 'dev' into teleport 2022-09-24 14:39:21 -03:00
Eduardo Quezada D'Ottone
a483899043
Merge branch 'dev' into symbiosis 2022-09-24 11:58:35 -03:00
GriffinR
1107ff954d Clean up shop.c 2022-09-22 15:08:17 -04:00
Eduardo Quezada D'Ottone
681ad8c7a9 Merge remote-tracking branch 'RHH_origin/dev_1.x' into RHH/pr/pokemonConfig 
# Conflicts:
#	src/data/pokemon/form_change_table_pointers.h
#	src/data/pokemon/form_change_tables.h
#	src/data/pokemon/form_species_table_pointers.h
#	src/data/pokemon_graphics/back_pic_coordinates.h
#	src/data/pokemon_graphics/front_pic_coordinates.h
 2022-09-18 18:25:05 -03:00
Eduardo Quezada D'Ottone
293a880238
Apply suggestions from code review 2022-09-18 00:50:21 -03:00
Ct11217
5f74781a7d Remove ACE_POKEMON_FUNCTIONALITY 2022-09-17 17:44:50 -06:00
Eduardo Quezada
720cb249d6 Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/reworkScald 
# Conflicts:
#	include/constants/battle_config.h
 2022-09-16 12:06:06 -03:00
ghoulslash
8bbe1b9037
Merge pull request #2327 from AsparagusEduardo/RHH/pr/Metronome 
Config to limit the moves called by Metronome (by generation)
 2022-09-16 11:03:33 -04:00
Eduardo Quezada
6b79c7772c Merge branch 'RHH/dev' into RHH/pr/pretmerge_20220909 
# Conflicts:
#	src/battle_interface.c
 2022-09-16 11:56:50 -03:00
Eduardo Quezada
672f572ff8 Config to limit the moves called by Metronome (by generation) 2022-09-16 11:04:30 -03:00
Eduardo Quezada
77696ca686 Rolled EFFECT_SCALD into EFFECT_BURN_HIT with a config for its Gen6+ change 2022-09-16 10:31:02 -03:00
ghoulslash
6616c89451
Merge pull request #2303 from Blackforest92/RHH-PR-Branch 
Tidying graphics - Trio Weather
 2022-09-15 18:01:43 -04:00
ghoulslash
354a8256e4
Merge pull request #2226 from Porygon23/AI-Logic-Updates 
Added corner case logic for AI Switching.
 2022-09-15 17:56:35 -04:00
Eduardo Quezada
bca1267ca8 Altered MAX_FRONTIER_PARTY_SIZE to be automatically calculated by the other frontier party sizes 2022-09-15 14:52:18 -03:00
Eduardo Quezada
dc423ef7ff Handling repel/lure menu 2022-09-14 00:18:01 -03:00
Eduardo Quezada
de32940fdf Further removed trailing whitespaces 2022-09-13 16:26:36 -03:00
Eduardo Quezada
1d7e8bd730 Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909 
# Conflicts:
#	asm/macros/battle_ai_script.inc
#	asm/macros/battle_script.inc
#	data/battle_ai_scripts.s
#	include/link_rfu.h
#	src/pokemon.c
#	src/pokemon_summary_screen.c
#	src/sound.c
 2022-09-13 16:22:42 -03:00
LOuroboros
14c6d8b91a Fixed alignment for the value of vars 0x4020 to 0x40FF 2022-09-12 21:33:03 -03:00
LOuroboros
cb83a09203 Fixed vars alignment 2022-09-12 21:27:53 -03:00
LOuroboros
222362e804 Fixed Raquaza typo 2022-09-12 21:26:22 -03:00
Eduardo Quezada
0944232059 Added shiny rerolls to Lures + reverted repel var name 2022-09-12 10:21:57 -03:00
Eduardo Quezada
e3005e5275 Item config for repel prompt 2022-09-12 10:21:52 -03:00
Eduardo Quezada
2d78ac0192 Implemented Lures using the same vars as repels 2022-09-12 10:21:49 -03:00
Deokishisu
e3c19f5df5 Implement B2W2 Repel System 
The game now asks if the player would like to use another Repel when the one they used runs out.

# Conflicts:
#	include/constants/vars.h
 2022-09-12 10:21:38 -03:00
Eduardo Quezada
4b1aca19cb Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909 
# Conflicts:
#	src/battle_controller_link_opponent.c
#	src/battle_controller_opponent.c
#	src/battle_controller_recorded_opponent.c
#	src/battle_controllers.c
#	src/data/pokemon_graphics/back_pic_coordinates.h
#	src/data/pokemon_graphics/front_pic_coordinates.h
#	src/pokemon.c
 2022-09-10 00:17:03 -04:00
LOuroboros
12fee71008 Merged FORM_ITEM_USE_TIME into FORM_ITEM_USE 2022-09-09 15:39:48 -03:00
Eduardo Quezada D'Ottone
69d3fafdcf
Merge pull request #2273 from LOuroboros/zazaForms 
Introduced FORM_BATTLE form changes
 2022-09-09 14:15:53 -04:00
Blackforest92
431cb6fa7c Tidying graphics - Trio Weather 2022-09-09 21:57:40 +07:00
Eduardo Quezada
8449f237c2 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/pokemonFlags 
# Conflicts:
#	src/pokemon.c
 2022-09-09 09:02:35 -04:00
Eduardo Quezada
21df8c279b Added SPECIES_FLAG_CANNOT_BE_TRADED 
- Also corrected Cylarex's forms not having the legendary flag
 2022-09-09 08:59:53 -04:00
Blackforest92
caf323a653 Erase ghost data in include/constants/map_groups.h 2022-09-09 00:40:30 +07:00
Blackforest92
3acb32acb8 Tyding graphics - Acupressure 2022-09-09 00:25:43 +07:00
Eduardo Quezada
7fe1e706b7 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/pokemonConfig 
# Conflicts:
#	include/constants/pokemon_config.h
 2022-09-08 08:52:13 -04:00
Eduardo Quezada D'Ottone
066a5bee85
Merge pull request #2277 from TheXaman/tx_debug_system_rhh 
Inclusion of the tx_debug_system
 2022-09-08 00:26:37 -04:00
Eduardo Quezada D'Ottone
47a50b3dac
Merge branch 'master' into weather_forms_fixes 2022-09-07 23:07:25 -04:00
GriffinR
74b563f696
Merge pull request #1749 from GriffinRichards/ur-classes 
Fix names and constant usage for union room classes
 2022-09-06 21:35:10 -04:00
LOuroboros
8705d1656b Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into teleport 2022-09-06 20:38:28 -03:00
TheXaman
6062cf45fa
Merge branch 'master' into tx_debug_system_rhh 2022-09-07 00:03:58 +02:00
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
Eduardo Quezada
3a6318f1d9 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/configRefactor 
# Conflicts:
#	include/constants/battle_config.h
 2022-09-06 15:20:54 -04:00
ghoulslash
971081b8fd
Merge pull request #2286 from AsparagusEduardo/RHH/pr/pretMerge_20220902 
Flat Merge Friday (Weekly merge)
 2022-09-06 15:13:47 -04:00
LOuroboros
0b07f4a06e Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into zazaForms 2022-09-06 10:53:12 -03:00
Eduardo Quezada
e253a87bc5 Consolidated Gen constants into config.h, with a new const called GEN_LATEST, to help edit all at once. 2022-09-05 14:49:14 -04:00
Eduardo Quezada
7c7da8e176 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/cleanConfigs 
# Conflicts:
#	src/battle_script_commands.c
 2022-09-05 14:43:04 -04:00
TheXaman
6cab795c5c
Update include/constants/overworld_config.h 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-09-05 11:02:44 +02:00
Eduardo Quezada
2ee843c70d Proper label for species flags 2022-09-04 22:13:28 -03:00
Eduardo Quezada
a4c242f2f8 Implemented Shiny Lock functionality 2022-09-04 21:55:59 -03:00
Eduardo Quezada
74c3fdfba7 Flag to allow certain species to always have perfect IVs (like Partner Pikachu and Eevee) 2022-09-04 19:41:01 -03:00
Eduardo Quezada
89550ed05d Updated Sport Ball's modifier. 2022-09-04 18:54:23 -03:00
Eduardo Quezada D'Ottone
4017fc3e20
Apply style suggestions from code review 2022-09-03 21:22:15 -04:00
Eduardo Quezada
5403cd036e Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902 
# Conflicts:
#	include/battle.h
#	include/battle_controllers.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controllers.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
 2022-09-02 23:24:08 -04:00
Eduardo Quezada
c7fc2e13f7 Renamed TM flags to keep consistency with the rest of the repo 2022-09-02 16:54:58 -04:00
Porygon23
ba6aad5bcc
Merge branch 'master' into AI-Logic-Updates 2022-09-02 14:44:47 -06:00
TheXaman
b4b3e84cbd removed default flags and added ingame warning if a function that requires them is used 2022-09-02 18:39:38 +02:00
TheXaman
367b12801e changed debug_config.h to overworld_config.h, 
changed no bag use and no catching flags to battle_config.h,
removed TX reference (big sad)
 2022-09-02 12:33:42 +02:00
TheXaman
ad57551db1 removed unnecessary script, cheat start now with national dex, reverted accidental type hin removal, changed indentation 2022-09-02 12:10:11 +02:00
GriffinR
a28fbbc1b8
Merge pull request #1748 from GriffinRichards/fix-judgement 
Standardize judgement vs judgment spelling
 2022-09-01 11:51:04 -04:00
LOuroboros
c167e2c6cc Added Legends: Arceus' move data 2022-08-30 19:32:44 -03:00
Eduardo Quezada
925384eedc Generations of Pokémon can now be disabled individually 2022-08-30 12:50:59 -04:00
Eduardo Quezada
df4c065ea6 Separated P_NEW_POKEMON into sections by generation. 
Sizes:
- GEN_3 15.690.076 bytes
- GEN_4 17.480.816 bytes
- GEN_5 19.544.944 bytes
- GEN_6 20.907.332 bytes
- GEN_7 22.233.288 bytes
- GEN_8 23.605.744 bytes
 2022-08-30 12:50:59 -04:00
TheXaman
3debf0442d changed the locations of tx_debug_system related #defines to its own file 'constants/debug_config.h' 2022-08-30 18:02:23 +02:00
TheXaman
04c40677bd Changed the way debug flags are handled, now in constants/battle_config.h 2022-08-30 17:41:35 +02:00
LOuroboros
df88317a98 Introduced FORM_BATTLE form changes 
For species such as Xerneas and Zacian.
 2022-08-29 19:10:52 -03:00
TheXaman
8c9a59ec1c Merge branch 'tx_debug_system' of https://github.com/TheXaman/pokeemerald into tx_debug_system_rhh 2022-08-29 19:13:11 +02: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
69f4c226f0 Merge remote-tracking branch 'RHH/master' into RHH_cleanConfigs 
# Conflicts:
#	src/battle_ai_main.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_script_commands.c
#	src/pokemon.c
#	src/pokemon_summary_screen.c
 2022-08-27 02:42:22 -04:00
Eduardo Quezada
15d611ba65 Usage of BATTLE_PARTNER 2022-08-27 01:26:13 -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
crater-git
54ee960970 Fixed Battle Frontier tutor move IDs 2022-08-26 10:12:11 -04: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
GriffinR
ce4a6e9067 MAP_NONE -> MAP_DYNAMIC 2022-08-25 21:34:05 -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
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
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
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
LOuroboros
7b7ba93d45 Fixed P_UPDATED_ABILITIES's comment 2022-08-24 20:35:13 -03: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
Ct11217
67f473f38b Fixed recommended issues. 
Added additional comments.
Reordered switching ladder in ShouldSwitch() function.
Functions that can specify a specific party mon to switch into need to come first.
 2022-08-23 19:49:54 -06:00
Eduardo Quezada
1f5adf93c7 Cleaned up use of configs be almost exclusively preproc functions 2022-08-23 21:00:08 -04:00
GriffinR
3771abbe08 Fix names and constant usage for union room classes 2022-08-23 12:44:07 -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
Eduardo Quezada
afcc1178b2 Merge remote-tracking branch 'pret/master' into MergedBranchUltimate 
# Conflicts:
#	data/battle_ai_scripts.s
#	data/battle_scripts_1.s
#	include/battle_controllers.h
#	include/battle_script_commands.h
#	include/battle_util.h
#	include/constants/battle_script_commands.h
#	include/constants/global.h
#	include/decompress.h
#	src/battle_anim_effects_1.c
#	src/battle_anim_normal.c
#	src/battle_anim_poison.c
#	src/battle_anim_water.c
#	src/battle_arena.c
#	src/battle_controller_link_opponent.c
#	src/battle_controller_link_partner.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controller_player_partner.c
#	src/battle_controller_recorded_opponent.c
#	src/battle_controller_recorded_player.c
#	src/battle_controller_safari.c
#	src/battle_controller_wally.c
#	src/battle_gfx_sfx_util.c
#	src/battle_interface.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/berry.c
#	src/data/trainers.h
#	src/decompress.c
#	src/field_effect.c
#	src/hall_of_fame.c
#	src/overworld.c
#	src/pokeball.c
#	src/pokemon.c
#	src/pokemon_icon.c
#	src/pokemon_storage_system.c
#	src/scrcmd.c
 2022-08-22 20:30:45 -04:00
Eduardo Quezada
75ac960365 Introduced P_NEW_POKEMON, which will disable all Gen4+ Pokémon and Forms 2022-08-22 17:27:21 -04:00
GriffinR
898ec580ae
Merge pull request #1737 from GriffinRichards/lock-unlock 
Clean up lock/unlock anim movement
 2022-08-22 01:30:33 -04:00
GriffinR
261b0ff118 Standardize judgement vs judgment spelling 2022-08-20 22:58:46 -04:00
GriffinR
9e175a1037
Merge pull request #1735 from GriffinRichards/arena-const 
Add some missing battle arena constants
 2022-08-20 22:54:32 -04:00
GriffinR
1685365cd4
Merge pull request #1727 from AsparagusEduardo/pret_clean 
Cleanup from https://github.com/pret/pokefirered/pull/532
 2022-08-19 21:27:55 -04:00
Blackforest92
a9d09bcd17 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into Legends_Arceus_Expansion 2022-08-19 17:53:01 +07:00
Ct11217
a4b53126f6 Added AI_FLAG_ACE_POKEMON 
When this flag is set, the trainer will have an "Ace" pokemon that will
always be sent out last.
If this flag is set, the last Pokemon in the party will be considered the
"Ace" Pokemon.

This is similar to the gym leader functionality found in Sword & Shield.
 2022-08-17 18:23:12 -06:00
Eduardo Quezada
5933c42439 Synced Route 4 and 10's MapSec labels 2022-08-16 18:23:37 -04:00
GriffinR
5515e328b2 Clean up lock/unlock anim movement 2022-08-12 21:18:10 -04:00
GriffinR
cf4d05e9e7 Fix typo 2022-08-11 12:09:38 -04:00
GriffinR
63468f9fcb Add some missing battle arena constants 2022-08-11 12:02:56 -04:00
Eduardo Quezada
1fd1870a13 Moved enum to include/pokemon.h 2022-08-08 18:40:47 -04:00
Eduardo Quezada
75d52dc762 Convert MON_DATA constants into enum to ease editing and addition of fields. 2022-08-08 18:18:17 -04:00
Eduardo Quezada
4b08a511c3 Cleanup from https://github.com/pret/pokefirered/pull/532 2022-08-07 22:40:15 -04:00
ExpoSeed
807c3fd17f Delete item and ability defines in configs 2022-08-02 00:28:42 -05:00
ExpoSeed
49da2ee53f Remove all the ifdefs for BATTLE_ENGINE, ITEM_EXPANSION, and POKEMON_EXPANSION 2022-08-02 00:15:55 -05:00
Eduardo Quezada
c6cdb2a281 Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge 2022-07-31 22:57:46 -04:00
Eduardo Quezada
9caca17064 Cleanup by syncing src/battle_script_commands.c with pokefirered 2022-07-29 09:43:16 -04:00
Greenphx9
05cbd6a906 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into 16-letter-move-names 2022-07-29 18:49:25 +10:00
LOuroboros
b9c83710c4
Sync this branch's include/constants/moves.h with the BE's 2022-07-28 11:12:28 -03:00
Eduardo Quezada
09af7422d5 Further cleaning after comparing with pokefirered 
STAT_BUFF changed to STAT_CHANGE, as it also uses debuffs
 2022-07-28 01:27:05 -04:00
Eduardo Quezada
e1c15a9cf6 Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge 2022-07-27 08:16:10 -04:00
LOuroboros
b59f7aed7f
Added a constant for NPC trainer name length (#1712) 2022-07-25 22:59:13 -04:00
LOuroboros
032b7b2ab9 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into yourAffection 2022-07-25 10:24:19 -03:00
Eduardo Quezada D'Ottone
bfb86fdc86 Config for Gen 3 faint switch mechanics 2022-07-24 14:57:47 -04:00
Eduardo Quezada
231727d02b Merge remote-tracking branch 'RHH/pokemon_expansion' into RHH_masterMerge 
# Conflicts:
#	asm/macros/event.inc
#	data/specials.inc
#	include/constants/species.h
#	src/data/pokemon/base_stats.h
 2022-07-22 23:33:04 -04:00
Eduardo Quezada
f3bebcd12c Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge 
# Conflicts:
#	include/battle_anim.h
#	include/global.h
#	include/pokemon.h
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/data/pokemon/base_stats.h
 2022-07-22 22:57:02 -04:00
ghoulslash
1260666c91
Merge pull request #1911 from AsparagusEduardo/PE_breedOverrides 
Added Egg breeding species overrides.
 2022-07-22 14:05:14 -04:00
ghoulslash
3a77b52bad
Merge pull request #2194 from AsparagusEduardo/BE_pretmerge 
Battle Engine pret merge
 2022-07-22 14:00:40 -04:00
Eduardo Quezada D'Ottone
56b9a50109 Merge remote-tracking branch 'RHH/battle_engine' into BE_plusMinus 
# Conflicts:
#	include/constants/battle_config.h
 2022-07-21 16:28:16 -04:00