Ultimate_Bob
|
32e63d8cc7
|
Don't copy opponent personality when swapping mon sprite during Mega Evolution (#2852)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2023-04-30 21:15:03 -04:00 |
|
Jaizu
|
4eb7b7048e
|
Make transform not break
|
2023-01-31 12:41:07 +01: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 |
|
Sneed69
|
c60de5055d
|
remove IsMoveWithoutAnimation
|
2022-06-03 17:42:42 +03:00 |
|
GriffinR
|
5e6d8a77e4
|
Document some generic argument names
|
2022-05-31 14:34:25 -04: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
|
31b501e7eb
|
Start misc battle documentation
|
2021-10-08 16:39:46 -04:00 |
|
GriffinR
|
a66d7e1b43
|
Document some single-remaining symbols
|
2021-09-24 17:14:20 -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 |
|
GriffinR
|
1b8d405b5e
|
Add missing include guard suffixes
|
2021-04-02 12:54:40 -04:00 |
|
ultima-soul
|
5bab9474dc
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-03-22 23:08:19 -07:00 |
|
GriffinR
|
a392cca928
|
Misc battle documentation
|
2021-01-23 00:40:31 -05:00 |
|
GriffinR
|
63a7828772
|
Document battle_controller_player.c
|
2021-01-22 20:03:27 -05:00 |
|
DizzyEggg
|
d0f91a996d
|
Tweak up mega evo
|
2019-05-02 23:10:01 +02:00 |
|
DizzyEggg
|
94752d4207
|
document battle bars
|
2018-06-19 00:43:15 +02:00 |
|
DizzyEggg
|
5ac6cc4860
|
move battle vars to c file
|
2018-02-07 22:53:40 +01:00 |
|
camthesaxman
|
6a4967689e
|
more renaming
|
2018-02-06 13:48:02 -06:00 |
|
DizzyEggg
|
32c7d4f252
|
make it compile
|
2017-11-04 16:25:19 +01:00 |
|
DizzyEggg
|
6c8155074b
|
battle 7 is decompiled
|
2017-11-04 16:11:13 +01:00 |
|