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 |
|
Martin Griffin
|
2380d13a43
|
Macros for keeping .partyFlags, .partySize, and .party in sync
|
2022-07-27 23:25:37 +01: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
|
6e62c057f5
|
Document remaining symbols in pokemon.c
|
2021-10-02 23:48:12 -04:00 |
|
Evan
|
f21b0140b9
|
revert to CheckViability and stat change effect viabilities
|
2021-01-04 19:39:59 -07:00 |
|
Evan
|
916d0416e3
|
outline AI_CheckGoodMove
|
2020-12-15 21:57:33 -07:00 |
|
Evan
|
ac332d5e98
|
check bad move
|
2020-12-13 15:02:21 -07:00 |
|
Fontbane
|
31b4656324
|
Labels better
|
2019-12-25 22:39:06 -05:00 |
|
Fontbane
|
2e8c20d72f
|
Update trainers.h
|
2019-12-25 20:48:40 -05:00 |
|
GriffinR
|
5c627518b3
|
Rename Grunts to use location-specific names
|
2019-11-04 16:45:00 -06:00 |
|
DizzyEggg
|
453be19670
|
change cooltrainer unused class name
|
2019-05-25 08:26:40 -05:00 |
|
DizzyEggg
|
a074f36766
|
USE PROTAG
|
2019-05-25 08:26:40 -05:00 |
|
DizzyEggg
|
e706280503
|
Rename PKMN TRAINER CALSS 4
|
2019-05-25 08:26:40 -05:00 |
|
DizzyEggg
|
ab421f1089
|
Use array count for trainer parties
|
2019-05-17 07:33:22 -05:00 |
|
DizzyEggg
|
c36476af85
|
Clean up data2b.c
|
2019-04-05 07:53:23 -05:00 |
|
Melody
|
eeb6446da4
|
add more consistent names
|
2018-12-02 22:36:09 -05:00 |
|
Melody
|
b9cf4f27b5
|
renames the winstrate graphics names to pokefan
|
2018-12-02 00:47:04 -05:00 |
|
DizzyEggg
|
5c7ca813e7
|
Add AI flags to trainers data
|
2018-09-01 21:25:19 +02:00 |
|
vblm12
|
29276cc76c
|
Move some trainer data from data2b.s to c structs.
|
2018-07-20 22:14:31 -05:00 |
|