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
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
ghoulslash
49a932a892
Merge pull request #2205 from AsparagusEduardo/BE_LightThatBurnsTheSky
...
Fixed Light That Burns The Sky not using the calculated damage category
2022-07-21 16:14:38 -04:00
ghoulslash
30a494f964
Merge pull request #2197 from AsparagusEduardo/BE_explosion
...
Config for Explosion halving defense
2022-07-21 16:11:32 -04:00
ghoulslash
504600c996
Merge pull request #2201 from AsparagusEduardo/BE_sturdy
...
Config for Sturdy's Gen5+ effect.
2022-07-21 16:09:01 -04:00
Eduardo Quezada D'Ottone
25397e5794
Fixed Light That Burns The Sky not using the calculated damage category
...
Also:
- Modified move defines to ease with future move expansion.
- Enabled Instruct's check for Z Moves in AI_CheckBadMove.
2022-07-21 15:13:00 -04:00
Eduardo Quezada D'Ottone
0f3fdd410a
Config for Sturdy's Gen5+ effect.
2022-07-20 13:06:41 -04:00
Eduardo Quezada D'Ottone
e14afd8957
Added Growth's Atk. raise to the its configuration, as that was also introduced in Gen 5.
2022-07-20 10:33:18 -04:00
Eduardo Quezada D'Ottone
cb34119711
Config for Charge raising Sp. Def.
2022-07-20 10:13:18 -04:00
Eduardo Quezada D'Ottone
fe63dafcc1
Merge branch 'battle_engine' into BE_pretmerge
...
# Conflicts:
# src/battle_anim_fire.c
# src/battle_controller_player.c
2022-07-20 08:50:30 -04:00
ghoulslash
2b5bb9f6e4
move gSwapDamagecategory to battle struct, use GetSplitBasedOnStats for photon geyser check
2022-07-19 18:24:53 -04:00
Eduardo Quezada D'Ottone
1cfb267b34
Config for Explosion halving defense
2022-07-18 13:10:27 -04:00
Eduardo Quezada D'Ottone
1dcbf59686
Config for Plus and Minus interaction
2022-07-18 08:11:02 -04:00
ghoulslash
6b84a9f0b3
merge w be
2022-07-17 12:40:43 -04:00
Eduardo Quezada D'Ottone
e791cf90ad
Merge tag 'pretmaster' into BE_pretmerge2
...
# Conflicts:
# data/battle_anim_scripts.s
# include/battle_anim.h
# include/battle_controllers.h
# include/battle_interface.h
# include/battle_main.h
# include/battle_setup.h
# include/constants/battle_anim.h
# include/constants/battle_string_ids.h
# src/battle_ai_switch_items.c
# src/battle_anim_fire.c
# src/battle_anim_normal.c
# src/battle_controllers.c
# src/battle_dome.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/pokemon.c
2022-07-15 12:58:46 -04:00
Eduardo Quezada D'Ottone
c69275f373
Merge remote-tracking branch 'pret/master' into PE_pretmerge
...
# Conflicts:
# include/battle_anim.h
# include/pokemon.h
# src/data/pokemon/base_stats.h
2022-07-12 17:20:49 -04:00
GriffinR
30a5821997
Merge pull request #1705 from sphericalice/move-unavailable
...
Introduces a MOVE_UNAVAILABLE constant
2022-07-12 11:32:57 -04:00
sphericalice
186f2c0232
Introduce a MOVE_UNAVAILABLE constant
2022-07-11 15:18:13 +01:00
Greenphx9
4294682d8c
16-letter move names
...
Move define, add spaces between comments, fix include
if TRUE -> if set to TRUE
Co-Authored-By: LOuroboros <lunosouroboros@gmail.com>
2022-07-11 12:49:30 +10:00
