Eduardo Quezada D'Ottone
|
75764ab91d
|
Fixed LoadChosenBattleElement documentation (#3713)
|
2023-12-12 20:57:14 +01:00 |
|
Alex
|
cb38f3bee6
|
Fixes legendary backgrounds (#3464)
* Fixes legendary backgrounds
* missed one
* forgot break
|
2023-10-25 17:06:25 +02:00 |
|
Eduardo Quezada
|
c0540a3559
|
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
# Conflicts:
# include/battle.h
# include/constants/battle_move_effects.h
# include/constants/battle_string_ids.h
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
|
2023-10-15 00:30:00 -03:00 |
|
Eduardo Quezada
|
92301398bc
|
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
# Conflicts:
# asm/macros/battle_script.inc
# data/battle_anim_scripts.s
# data/battle_scripts_1.s
# include/battle.h
# include/battle_controllers.h
# include/battle_interface.h
# include/config/battle.h
# include/constants/battle.h
# include/constants/battle_anim.h
# include/constants/battle_move_effects.h
# include/constants/battle_string_ids.h
# include/data.h
# include/random.h
# sound/cry_tables.inc
# src/battle_anim_new.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/data/pokemon/form_change_table_pointers.h
# src/data/pokemon/species_info.h
# src/data/text/move_names.h
# test/test_runner_battle.c
|
2023-10-09 16:51:41 -03:00 |
|
Eduardo Quezada
|
d1c672d3ce
|
Converted most battle preproc ifs to regular ifs
|
2023-10-08 21:32:15 -03:00 |
|
Eduardo Quezada
|
a6940c9e03
|
Merge branch 'pret_master' into RHH/pr/upcoming/pret_Merge20231002
# Conflicts:
# src/battle_ai_script_commands.c
# src/battle_controller_player.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_safari.c
# src/battle_controller_wally.c
# src/battle_controllers.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_script_commands.c
# src/battle_util.c
# src/mystery_gift_menu.c
# src/pokemon.c
|
2023-10-02 17:17:41 -03:00 |
|
Eduardo Quezada
|
af210da972
|
Solved a bunch of -Wall errors on modern
|
2023-09-20 19:01:08 -03:00 |
|
Gabriel Cowley
|
d585c520ff
|
Fix Z effect descriptions being cut off (#3286)
|
2023-09-08 07:09:11 -03:00 |
|
Eduardo Quezada
|
4c57b84cd9
|
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230602
# Conflicts:
# graphics/pokemon/mawile/footprint.png
# src/battle_gfx_sfx_util.c
# src/fldeff_sweetscent.c
# src/pokedex.c
|
2023-06-02 11:45:28 -04:00 |
|
GriffinR
|
14f7e49099
|
Add some missing palette macro use
|
2023-05-25 15:09:16 -04:00 |
|
AgustinGDLV
|
ec4b330b9b
|
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax
|
2023-03-10 21:00:41 -08:00 |
|
DizzyEggg
|
468625ed1d
|
fit long z-moves names on battle textbox
|
2023-02-27 10:32:45 +01:00 |
|
AgustinGDLV
|
38f462551f
|
pulled rhh master, i hate merge conflicts
|
2023-02-22 18:50:54 -08:00 |
|
Eduardo Quezada
|
749225ace1
|
Matching merge from upstream pret
# Conflicts:
# graphics/interface/menu_info.png
# include/pokemon.h
# src/battle_ai_switch_items.c
# src/battle_anim_mons.c
# src/battle_anim_water.c
# src/battle_controller_opponent.c
# src/battle_gfx_sfx_util.c
# src/battle_main.c
# src/battle_pike.c
# src/battle_script_commands.c
# src/data/pokemon/species_info.h
# src/pokemon.c
# src/pokemon_summary_screen.c
|
2023-01-20 12:31:54 -03:00 |
|
GriffinR
|
0cc10a1ada
|
Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize
|
2023-01-18 11:07:12 -05:00 |
|
Eduardo Quezada
|
011ec16f1e
|
Organized conffig files into their own folder and cleaned up
|
2022-11-14 11:03:49 -03:00 |
|
AgustinGDLV
|
7981887f0a
|
merge kyogre, groudon, rayquaza battle types
|
2022-10-27 11:20:46 -07: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 |
|
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
|
1f5adf93c7
|
Cleaned up use of configs be almost exclusively preproc functions
|
2022-08-23 21:00:08 -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 |
|
GriffinR
|
261b0ff118
|
Standardize judgement vs judgment spelling
|
2022-08-20 22:58:46 -04:00 |
|
Martin Griffin
|
d57442a511
|
Decimal paletteNums
|
2022-08-19 17:05:22 +01:00 |
|
Martin Griffin
|
6fed961ed6
|
Write palette IDs in hex
|
2022-08-19 15:29:35 +01:00 |
|
Eduardo Quezada
|
2e1bf0d965
|
OamData mosaic FALSE
|
2022-07-29 21:27:39 -04:00 |
|
Eduardo Quezada
|
13672680b0
|
void pointer standarized
|
2022-07-29 10:52:35 -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 |
|
GriffinR
|
593e2c9be0
|
Fix inconsistent static s/g names
|
2022-05-17 14:00:02 -04: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 |
|
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
|
a334f7f5e0
|
changed all missed ones to #if P_ENABLE_DEBUG == TRUE @LOuroboros
|
2021-12-13 18:58:13 +01:00 |
|
TheXaman
|
bbe918941e
|
added include/constants/pokemon_debug,h for defines, restructured code order
|
2021-12-11 12:13:14 +01:00 |
|
TheXaman
|
44121b041c
|
added battle bg's and platforms and a function LoadBattleBg to change them
|
2021-12-10 20:40:34 +01:00 |
|
ultima-soul
|
23bf41713c
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-12-01 20:17:08 -08:00 |
|
LOuroboros
|
b042eb6436
|
gBattleTerrainTable -> sBattleTerrainTable
|
2021-11-28 01:22:27 -03:00 |
|
ultima-soul
|
3ed51d6d91
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-11-21 10:40:26 -08:00 |
|
GriffinR
|
41ecae91f8
|
Label remaining symbols in graphics.c
|
2021-10-27 13:47:18 -04:00 |
|
GriffinR
|
d8e65fc4b6
|
More battle doc, add battle window ids
|
2021-10-09 03:01:10 -04:00 |
|
GriffinR
|
31b501e7eb
|
Start misc battle documentation
|
2021-10-08 16:39:46 -04:00 |
|
ghoulslash
|
9d8672e3df
|
merge with be
|
2021-09-16 13:12:59 -04:00 |
|
ExpoSeed
|
0f99d9d4c6
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
|
2021-08-30 13:26:40 -05:00 |
|
ultima-soul
|
02c9e040df
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-08-11 16:33:10 -07:00 |
|
ghoulslash
|
a37d4c3da9
|
merge with be, give life dew jungle healing effect
|
2021-07-25 08:22:05 -06:00 |
|
PikalaxALT
|
810ca5f8ff
|
Flatten pos fields in struct Sprite
|
2021-07-07 09:11:52 -04:00 |
|
ghoulslash
|
c356ffaed4
|
merge with be. fix null ptr check in GetBattleMoveSplit
|
2021-05-24 10:46:53 -06:00 |
|
ultima-soul
|
14a0303e2f
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-04-27 18:36:37 -07:00 |
|
GriffinR
|
8368b753df
|
More usage of WININ/OUT constants
|
2021-04-15 02:43:09 -04:00 |
|
ultima-soul
|
939608f5b8
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-04-02 13:16:40 -07:00 |
|