Eduardo Quezada
|
41bf9ea63c
|
Removed trailing whitespaces
|
2023-02-26 18:43:15 -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
|
4736b4b14d
|
Merge pull request #1810 from AsparagusEduardo/pret/pr/baseStatsRename
Renamed gBaseStats to gSpeciesInfo
|
2022-11-18 17:45:23 -05: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
|
bd63ef18af
|
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030
# Conflicts:
# src/pokemon_storage_system.c
|
2022-11-09 19:33:26 -03:00 |
|
tustin2121
|
b32413d11e
|
Restoring the GFHeader
- Also adding comment about what the header does and how to maintain it.
|
2022-11-02 12:45:36 -04:00 |
|
tustin2121
|
fd87c97ef8
|
Adding documentation about GFHeader
|
2022-11-02 12:42:58 -04:00 |
|
Eduardo Quezada
|
3ed485632f
|
Renamed gBaseStats to gSpeciesInfo
|
2022-10-24 17:01:48 -03: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 |
|
LOuroboros
|
b59f7aed7f
|
Added a constant for NPC trainer name length (#1712)
|
2022-07-25 22:59:13 -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 |
|
GriffinR
|
8950a41bfd
|
Update some GF rom header names
|
2022-06-21 18:31:09 -04: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 |
|
GriffinR
|
9b2038a9a5
|
Additional GF ROM header doc
|
2021-11-01 02:54:53 -04:00 |
|
GriffinR
|
e0e2212db3
|
Avoid changed section warning
|
2021-11-01 01:47:38 -04:00 |
|
GriffinR
|
ef2971d8dc
|
Convert GF ROM header to C
|
2021-11-01 01:42:02 -04:00 |
|