Eduardo Quezada
620e69945d
Form change for starting and ending battles. Adjusted PP for Iron Head/Behemoth moves
2022-10-20 16:40:24 -03:00
LOuroboros
02c6bc64b2
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into becomingAHero
2022-10-07 12:20:52 -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
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 D'Ottone
7825153bb2
Merge pull request #2282 from AsparagusEduardo/RHH/pr/tutorFix
...
Exp Candy Fixes
2022-09-15 22:46:59 -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
Eduardo Quezada
61752a4977
Added parenthesis to GET_SHINY_VALUE
2022-09-11 13:35:58 -04: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
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
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
TheXaman
6062cf45fa
Merge branch 'master' into tx_debug_system_rhh
2022-09-07 00:03:58 +02:00
ghoulslash
59de7e48e5
Merge pull request #2265 from AsparagusEduardo/RHH_substructFix
...
Fixed PokemonSubstruct3 alignment
2022-09-06 15:14:45 -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
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
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
3264c3c87a
Shows amount of Exp gained.
2022-08-31 09:05:51 -04: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
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
12b32606f5
Fixed PokemonSubstruct3 alignment
2022-08-27 03:05:06 -04:00
LOuroboros
922bbacd71
Updated GetMonFriendshipScore
...
-Moved it to src/pokemon.c
-Made a battle specific variant called GetBattlerFriendshipScore.
-Made that variant return 0 for Mega Evolved 'mons and if called on link battles.
2022-08-26 21:33:43 -03:00
crater-git
f8fb4e8cf2
Renamed funcs, lists, etc. - Teach->Teachable
2022-08-26 14:48:06 -04:00
crater-git
b8a3cc2846
Consolidated funcs, renamed CanMonLearnMove
2022-08-26 11:07:08 -04:00
crater-git
ed02c4b425
Removed tutor move distinction, combined llists
2022-08-25 19:56:47 -04:00
Eduardo Quezada
af137c9b9d
Multiple changes
...
- Simplified LoadSpecialPokePic
- Changed all checks flag checks to houldShowFemaleDifferences
2022-08-25 03:42:41 -04:00
crater-git
45511fcc44
Reworked TMHM into expandable list format
2022-08-23 21:44:42 -04:00
GriffinR
3771abbe08
Fix names and constant usage for union room classes
2022-08-23 12:44:07 -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
0149f420f9
Corrected comment
2022-08-15 17:36:55 -04:00
Eduardo Quezada
1fd1870a13
Moved enum to include/pokemon.h
2022-08-08 18:40:47 -04:00
Eduardo Quezada
01558ff8f3
Struct pointers star standarizing
2022-07-29 11:15:33 -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
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
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
1ca1bff81c
Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into doc-arg
2022-06-03 15:43:21 -04:00
GriffinR
34438e6bc4
Continue documenting generic arguments
2022-06-03 15:38:03 -04:00
GriffinR
5e6d8a77e4
Document some generic argument names
2022-05-31 14:34:25 -04:00
sneed
c8e08edbae
rename item1 and item2 in BaseStats
2022-05-23 19:10:24 +03:00
ghoulslash
7bc50392d0
Merge pull request #2072 from AsparagusEduardo/PE_ShellBlastEverstone
...
Fixed Shelmet and Karrablast being able to evolve if the partner is holding an Everstone
2022-04-27 08:51:37 -04:00
TheXaman
c54bf21b01
Merge branch 'master' of https://github.com/pret/pokeemerald into tx_debug_system
2022-04-16 23:18:35 +02:00
LOuroboros
f82c946ff3
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge
2022-04-03 13:26:27 -03:00
LOuroboros
fa39dc76dc
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
ExpoSeed
f50a406b18
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2022-03-22 12:56:23 -05:00
ultima-soul
84a7f960c8
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2022-02-28 23:37:41 -08:00
ultima-soul
86089ce935
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2022-02-28 22:13:14 -08:00
Eduardo Quezada D'Ottone
ed1ea69759
Fixed Shelmet and Karrablast being able to evolve if the partner is holding an Everstone
2022-02-26 21:40:20 -03:00
GriffinR
225147a94f
Document Spinda spot algorithm
2022-01-17 15:34:18 -05:00
GriffinR
aadab8b016
Move pokemon and easy chat constants to global, misc clean-up
2021-12-28 18:07:41 -05:00
LOuroboros
d6a78f386f
Implemented evolution moves
...
Thanks to UltimaSoul and Sagiri/Zeturic
2021-12-22 18:02:23 -03:00
Eduardo Quezada D'Ottone
8b49f8f925
Merge branch 'pokemon_expansion' into PE_FormChangeHoldItems
2021-12-19 12:08:52 -03:00
ultima-soul
18afd06f6d
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-12-18 00:28:18 -08:00
ultima-soul
4f2e3bf214
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-12-17 21:23:54 -08:00
ExpoSeed
d6747527da
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2021-12-16 21:44:01 -06:00
TheXaman
f6d9b74a1a
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into pokemon_expansion_debug
2021-12-10 16:48:46 +01:00
Eduardo Quezada D'Ottone
96b8d21b7a
Added form switching + Button icons
2021-12-03 19:32:31 -03:00
TheXaman
5780560007
fixed some bugs, thanks to cbt
2021-11-28 20:28:54 +01:00
ultima-soul
57bf1c7824
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-11-21 10:41:12 -08:00
ultima-soul
3ed51d6d91
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-21 10:40:26 -08:00
ghoulslash
964e7efba9
fix MOVE_TARGET_ALL_BATTLERS and other u8 vars
2021-10-16 16:23:17 -04:00
GriffinR
b8a44bf10a
Calculate pokemon substruct size, missing MON_PIC_SIZE
2021-10-11 10:35:53 -04:00
GriffinR
6e62c057f5
Document remaining symbols in pokemon.c
2021-10-02 23:48:12 -04:00
GriffinR
739e7d3c31
Document summary screen sprite manager
2021-10-02 23:47:59 -04:00
Eduardo Quezada D'Ottone
55b61313a4
PSS uses form change table for holding items.
...
# Conflicts:
# src/pokemon.c
2021-09-29 02:13:44 -03:00
Eduardo Quezada D'Ottone
f9d1375451
Merge pull request #1375 from ExpoSeed/PE/form-change-table
...
Form change table
2021-09-22 00:04:26 -03:00
ExpoSeed
c8fc141287
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2021-06-10 11:54:20 -05:00
ultima-soul
f3f4d8e608
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-06-07 19:52:20 -07:00
ultima-soul
0a87adad1a
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-06-07 18:05:52 -07:00
ultima-soul
cf19635a80
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-06-07 13:15:46 -07:00
ultima-soul
092f02f119
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-06-07 12:00:23 -07:00
Kurausukun
2bbaf71998
[LEAK-INFORMED] fix CreateShedinja fakematch
...
info: the header change is required. accesses to the struct need to be
treated as non-const, even though the array must be const. thanks to
jiang for figuring this out.
2021-05-31 08:20:46 -05:00
ghoulslash
c356ffaed4
merge with be. fix null ptr check in GetBattleMoveSplit
2021-05-24 10:46:53 -06:00
ExpoSeed
f922d42988
Refactor hidden abilities
2021-04-16 23:38:35 -05:00
ExpoSeed
db2b995bc6
Introduce NUM_ABILITY_SLOTS
2021-04-16 23:37:55 -05:00
ExpoSeed
27c6964a05
Merge branch 'num_ability_slots' into BE/num_ability_slots
2021-04-16 20:45:34 -05:00
ExpoSeed
49bb345338
Introduce NUM_ABILITY_SLOTS
2021-04-16 20:36:45 -05:00
ExpoSeed
cf9d5f8563
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into PE/form-change-table
2021-04-04 01:11:32 -05:00
ultima-soul
be7acc919a
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-04-03 21:53:29 -07:00
ultima-soul
56a1cab314
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-03-23 15:21:19 -07:00
ultima-soul
5bab9474dc
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-03-22 23:08:19 -07:00
ExpoSeed
6f64c1b2b9
Implement GetFormChangeTargetSpecies
2021-03-03 13:07:50 -06:00
ExpoSeed
f7d42cd3c8
Formatting
2021-03-02 14:25:15 -06:00
ExpoSeed
7e8659c4ee
Fix missed merge conflict
2021-03-02 14:17:48 -06:00
ExpoSeed
7802264732
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into PE/form-change-table
2021-03-01 19:38:13 -06:00
GriffinR
e059c4fdfa
Use new gift ribbons size, label unused ribbons
2021-02-17 14:11:45 -05:00
Deokishisu
7b2bf8c7e2
Rename obedient/fatefulEncounter to eventLegal
...
Per discussion on pret, `obedient`/`fatefulEncounter` has been renamed to `eventLegal`, and all related functions and constants have been modified with this in mind.
Additionally, fixed some whitespace alignment issues in `script_cmd_table.h`, `pokemon.h`, and `tv.c` from the last commit.
2021-02-15 14:54:35 -05:00
Deokishisu
b89c3e901e
Fix giftRibbons Field in SaveBlock1 & Relabel Gift Ribbons in pokemon.h
...
The giftRibbons field has been split out into proper subfields. The new ExternalEvent structs deal with interconnectivity between external games/peripherals and Emerald, such as PokéCoupon storage and the flag for receiving Wishmaker Jirachi.
The giftRibbon fields in `PokemonSubstruct3` have also been renamed to their appropriate ribbons, and commented with distribution info if applicable. The previous `fatefulEncounter` field was actually filler, and relabeled as such, while the obedient bit was renamed `fatefulEncounter`. All relevant constants and functions dealing with the Pokémon data structure were renamed with these changes in mind.
2021-02-15 11:40:16 -05:00
ultima-soul
46e853c13b
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-02-03 16:23:23 -08:00
ultima-soul
daf5e0167e
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-02-03 16:06:48 -08:00
Evan
0483114a05
merge and some fixes
2021-02-02 11:45:15 -07:00
ultima-soul
5fdb578747
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-02-01 15:58:18 -08:00
ultima-soul
2a20d50904
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-02-01 15:54:08 -08:00
ultima-soul
96232ea166
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-01-28 23:59:08 -08:00
ExpoSeed
34c6771e94
Create form change table
2021-01-27 16:30:43 -06:00
GriffinR
a392cca928
Misc battle documentation
2021-01-23 00:40:31 -05:00
ghoulslash
32cc04c91c
Merge pull request #1311 from ultima-soul/deoxys_handling_removal
...
Remove Special Handling for Deoxys
2021-01-21 12:22:03 -07:00
Evan
39139323f6
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into zmove
2021-01-20 17:36:37 -07:00
ghoulslash
9b1a482837
Merge pull request #1317 from ultima-soul/form_species_tables_ie
...
Add Form Species ID Tables
2021-01-20 13:54:58 -07:00
ghoulslash
71f18bfbf4
Merge pull request #1316 from ultima-soul/form_species_tables_be
...
Add Form Species ID Tables
2021-01-20 13:54:39 -07:00
ghoulslash
b4b1d2b9e2
Merge pull request #1315 from ultima-soul/form_species_tables_pe
...
Add Form Species ID Tables
2021-01-20 13:54:20 -07:00
