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 |
|
Eduardo Quezada
|
7b3401ee27
|
Standarized use of star in pointer types
|
2022-07-29 10:17:58 -04:00 |
|
ultima-soul
|
0312c5be8b
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-11-27 21:38:26 -08: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
|
c4169cfd29
|
Disambiguate cry functions
|
2021-11-07 14:26:09 -05:00 |
|
GriffinR
|
fc15b0d5f0
|
Add controller buffer constants, finish misc battle doc
|
2021-10-13 16:21:39 -04:00 |
|
GriffinR
|
d8e65fc4b6
|
More battle doc, add battle window ids
|
2021-10-09 03:01:10 -04:00 |
|
ultima-soul
|
02c9e040df
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-08-11 16:33:10 -07:00 |
|
PikalaxALT
|
810ca5f8ff
|
Flatten pos fields in struct Sprite
|
2021-07-07 09:11:52 -04: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
|
62abcecc54
|
More usage of DISPLAY constants
|
2021-04-15 02:22:24 -04:00 |
|
GriffinR
|
f4d8a91ba4
|
Misc battle script cleanup
|
2021-04-03 14:07:31 -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
|
b71b10623b
|
Add palette selection constants
|
2021-02-24 11:03:51 -05:00 |
|
ultima-soul
|
2a20d50904
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-02-01 15:54:08 -08:00 |
|
GriffinR
|
b9baf9437d
|
Sync safari/wally controller doc to player
|
2021-01-22 20:13:34 -05:00 |
|
GriffinR
|
63a7828772
|
Document battle_controller_player.c
|
2021-01-22 20:03:27 -05:00 |
|
GriffinR
|
4eca05ccf5
|
Document remainder of battle_controllers.c
|
2021-01-22 02:48:22 -05:00 |
|
GriffinR
|
b65980cd4e
|
Remove unused local variables and functions
|
2021-01-19 18:19:33 -05:00 |
|
GriffinR
|
2f426e0e7d
|
Index battle controller cmd tables
|
2020-12-29 17:21:58 -05:00 |
|
DizzyEggg
|
97d0643110
|
Merge with master
|
2020-09-08 12:48:28 +02:00 |
|
PokeCodec
|
28ef2fb774
|
Switch to button macros
|
2020-09-04 21:11:55 -04:00 |
|
GriffinR
|
afb3472282
|
Minor battle_anim_throw cleanup
|
2020-08-30 15:11:44 -04:00 |
|
DizzyEggg
|
2646f3b26a
|
Merge with master
|
2019-04-13 13:42:44 +02:00 |
|
Phlosioneer
|
50350cc2e1
|
Merge branch 'master' into contest-ai-cleanup
|
2019-04-07 20:20:22 -04:00 |
|
DizzyEggg
|
f8713f9c15
|
Merge with master
|
2019-04-06 20:43:13 +02:00 |
|
DizzyEggg
|
b0223f691f
|
Clean up data headers
|
2019-04-05 07:53:23 -05:00 |
|
Phlosioneer
|
1360b3a477
|
RGB Constants
|
2019-04-04 17:05:46 -04:00 |
|
DizzyEggg
|
54ab6b43dc
|
Merge with master
|
2019-03-22 10:40:31 +01:00 |
|
Phlosioneer
|
5886f82ef5
|
Merge branch 'master' into extern-cleanup
|
2019-03-08 02:45:26 -05:00 |
|
DizzyEggg
|
fddb5159b4
|
Merge with master
|
2019-03-05 21:46:45 +01:00 |
|
DizzyEggg
|
e79b6f747b
|
Fix Controllers end command function names
|
2019-03-05 20:07:59 +01:00 |
|
Phlosioneer
|
3ceb1667c9
|
Reduce externs
|
2019-03-01 22:32:50 -05:00 |
|
Phlosioneer
|
d979ac3bf3
|
Document main_menu state machine, name window constants
The new names for the constants (and newly named functions) give a much
better understanding of what the window system is trying to do.
|
2019-02-11 00:34:50 -05:00 |
|
DizzyEggg
|
78d7c29290
|
Move buffers to allocated reousrces, get rid of old type effectiveness table
|
2019-01-05 16:00:57 +01:00 |
|
DizzyEggg
|
4827776a3c
|
Merge with master
|
2019-01-05 10:14:20 +01:00 |
|
Philipp AUER
|
55202eac24
|
rename coords to size in struct MonCoords
|
2019-01-04 19:59:55 -06:00 |
|
DizzyEggg
|
a5df797804
|
Merge branch 'master' into battle_engine_v2
|
2018-11-19 20:42:07 +01:00 |
|
Marcus Huderle
|
72f0a079a9
|
Decompile all of battle_anim_utility_funcs
|
2018-11-19 09:37:25 -06:00 |
|
DizzyEggg
|
65036b9a09
|
Merge with master
|
2018-11-15 21:53:32 +01:00 |
|
Slawter666
|
4311fd8b89
|
Sort includes into alphabetical order
|
2018-11-14 00:01:50 +00:00 |
|
DizzyEggg
|
e9965dd341
|
merge with master
|
2018-11-02 22:55:32 +01:00 |
|
garak
|
901f3ff557
|
use sound panning constants in battle_anim_scripts
|
2018-10-19 15:57:19 -04:00 |
|
DizzyEggg
|
a69af8f2f5
|
Merge with master
|
2018-09-22 00:22:13 +02:00 |
|
DizzyEggg
|
e4b7ba0977
|
Document some not labeled battle things
|
2018-09-20 11:55:35 +02:00 |
|
DizzyEggg
|
facd838112
|
Add debug controller to all controllers
|
2018-09-18 21:51:10 +02:00 |
|
DizzyEggg
|
43b74032fa
|
Make pyramid bag compile.
|
2018-08-30 20:25:57 +02:00 |
|
DizzyEggg
|
ea5ffa3375
|
Merge with master
|
2018-07-16 20:23:05 +02:00 |
|
Diegoisawesome
|
731d6d59bc
|
Document list_menu.c and main_menu.c
|
2018-07-15 04:30:37 -07:00 |
|
DizzyEggg
|
c556358e47
|
label multiuse sprite template functions
|
2018-07-01 15:28:57 +02:00 |
|