Eduardo Quezada
|
0d5b00aaf2
|
Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829
# Conflicts:
# README.md
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# data/maps/BattleFrontier_Lounge7/scripts.inc
# include/battle_anim.h
# include/battle_message.h
# include/constants/items.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_anim_throw.c
# src/battle_anim_utility_funcs.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_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/data/party_menu.h
# src/data/pokemon/tmhm_learnsets.h
# src/daycare.c
# src/field_specials.c
# src/hall_of_fame.c
# src/party_menu.c
# src/pokemon.c
# src/tv.c
|
2023-08-31 14:28:01 -04:00 |
|
GriffinR
|
65fee186f8
|
Automatically update nickname buffer sizes
|
2023-08-08 16:28:09 -04:00 |
|
Eduardo Quezada
|
3aaa89ce71
|
Changed all instances of gSpeciesNames so that it uses GetSpeciesName
|
2023-07-07 14:37:51 -04:00 |
|
Eduardo Quezada
|
9917f5cc8b
|
Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303
# Conflicts:
# Makefile
# include/constants/pokemon.h
# include/pokemon.h
# make_tools.mk
# src/battle_ai_script_commands.c
# src/battle_controllers.c
# src/battle_main.c
# src/battle_script_commands.c
# src/party_menu.c
# src/pokemon.c
# src/trade.c
# src/trainer_pokemon_sprites.c
|
2023-03-03 11:00:50 -03:00 |
|
Eduardo Quezada
|
079ca8ab29
|
Renamed MON_DATA_SPECIES2 to MON_DATA_SPECIES_OR_EGG for clarification
|
2023-02-24 07:53:02 -03:00 |
|
Eduardo Quezada
|
af137c9b9d
|
Multiple changes
- Simplified LoadSpecialPokePic
- Changed all checks flag checks to houldShowFemaleDifferences
|
2022-08-25 03:42:41 -04:00 |
|
GriffinR
|
5e6d8a77e4
|
Document some generic argument names
|
2022-05-31 14:34:25 -04:00 |
|
GriffinR
|
1b35f9adad
|
Use specific name limits for string limit functions
|
2021-11-17 22:11:03 -05:00 |
|
GriffinR
|
3b91d8fdaf
|
Start pokenav list ui doc
|
2021-11-12 20:36:19 -05:00 |
|
GriffinR
|
004d1cab3f
|
Clean up pokenav conditions doc
|
2021-11-12 11:13:49 -05:00 |
|
GriffinR
|
35aeff1b6d
|
Rename pokenav conditions files
|
2021-11-12 11:07:52 -05:00 |
|