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
LOuroboros
add75d84c0
Applied a couple of tweaks
...
-Made it so only Rare Candies can evolve Lv100 'mons. Game Freak dumb. The Exp. Candies SHOULD work too.
-Made sure to remove the candy that was used from the bag.
2022-11-25 18:12:51 -03:00
LOuroboros
53110a0ff6
Allow Lv100 'mons to access level based evos
2022-11-25 17:34:11 -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
kaisermg5
2cd0a0f862
Fix lock when teaching a TM/HM after learning a move by level up.
2022-10-25 18:48:06 -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
3d214f8204
Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/pokemonFlags
...
# Conflicts:
# src/pokemon.c
2022-09-27 10:13:32 -03:00
GriffinR
e515e52abb
Add DISPLAY_TILE_* constants
2022-09-26 19:52:17 -04:00
ghoulslash
ff42806e04
Merge pull request #2335 from AsparagusEduardo/RHH/pr/MultiBattleFix
...
Multi battle interface fix
2022-09-26 09:12:40 -04:00
Eduardo Quezada D'Ottone
d59d8b92af
Merge branch 'dev' into AI
2022-09-24 11:07:09 -03:00
LOuroboros
5f67335212
Fixed typo in BoxMonKnowsMove
2022-09-19 05:21:54 -03:00
Eduardo Quezada
adb4e54e95
Fixed multi battle battler coordinates and party menu when only one Pokémon is chosen
2022-09-18 22:34:06 -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
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
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
8d94c58cac
Shows exp when leveling up with Exp Candies
2022-08-31 21:54:27 -04:00
Eduardo Quezada
3264c3c87a
Shows amount of Exp gained.
2022-08-31 09:05:51 -04:00
Eduardo Quezada
fe5f30c200
Fixed moves learned at the same level being skipped while using exp candies
2022-08-30 22:50:46 -04:00
Eduardo Quezada
494e8791d7
Fixed tutors changing levels
2022-08-30 22:06:25 -04: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
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
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
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
DizzyEggg
622a7f8141
merge with master
2022-08-25 22:10:59 +02:00
DizzyEggg
63370b065d
Party menu supports 4digit hp
2022-08-25 17:31:14 +02:00
DizzyEggg
a0ec8a5a80
4 digit hp in battle
2022-08-25 16:40:56 +02:00
DizzyEggg
7aa55f2753
better interface 1 player mon in double
2022-08-24 23:00:21 +02:00
Eduardo Quezada D'Ottone
21867a6061
Merge branch 'master' into AI
2022-08-24 01:07:35 -04:00
crater-git
45511fcc44
Reworked TMHM into expandable list format
2022-08-23 21:44:42 -04:00
DizzyEggg
05ec8fb182
AI knows Party mons
2022-08-23 11:58:17 +02: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
c1c9837bfc
Merge remote-tracking branch 'RHH/item_expansion' into MergedBranchUltimate
2022-08-22 17:31:21 -04:00
GriffinR
81ef818f61
Merge pull request #1731 from GriffinRichards/missing-tag
...
Move party menu data constants
2022-08-20 22:43:52 -04:00
tustin2121
1cb659df8c
Renaming Script Contexts
...
- Determined how the various script contexts were used and renamed accordingly.
- ScriptContext2_Enable/Disable => Lock/UnlockPlayerFieldControls - The sole purpose of the flag is to make sure the player can't move around in the overworld. It has nothing to do with script contexts.
- ScriptContext1 => ScriptContext - It is the global script context used to set up scripts which run over many frames.
- ScriptContext2_RunNewScript => RunScriptImmediately - ScriptContext2's sole purpose was to run scripts immediately and in a separate context, usually while the global context is waiting for things like map loads or screen changes.
2022-08-15 15:18:12 -04:00
Eduardo Quezada D'Ottone
3d94ada041
Merge pull request #2166 from Sneed69/fix_tm_compat
...
Fix tm/hm compatibility
2022-08-11 10:07:03 -04:00
GriffinR
e06ba39751
Use button constants in Task_HandleChooseMonInput
2022-08-10 15:14:35 -04:00
GriffinR
f534e8e44a
Move party menu data constants
2022-08-10 14:30:01 -04: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
a72d4c4168
Cleanup from syncing pss and mon markings
2022-07-30 12:43:14 -04:00
Eduardo Quezada
01558ff8f3
Struct pointers star standarizing
2022-07-29 11:15:33 -04:00
Eduardo Quezada
7b3401ee27
Standarized use of star in pointer types
2022-07-29 10:17:58 -04:00
Eduardo Quezada
a37d8b1346
Documented boolean uses
2022-07-25 14:59:14 -04:00
Eduardo Quezada
e96c9c87fa
Merge remote-tracking branch 'RHH/item_expansion' into RHH_masterMerge
...
# Conflicts:
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
2022-07-22 23:38:52 -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
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
f78bb4fb84
Merge remote-tracking branch 'pret/master' into item_expansion
...
# Conflicts:
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
2022-07-12 17:42:32 -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
