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
|
9dc64b67cd
|
Review changes
|
2022-07-29 15:38:23 -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
|
342b7da5d3
|
Fix CRY_MODE_ECHO
|
2021-11-10 11:59:15 -05:00 |
|
GriffinR
|
c4169cfd29
|
Disambiguate cry functions
|
2021-11-07 14:26:09 -05:00 |
|
GriffinR
|
54b254a829
|
Add CRY_MODE constants
|
2021-11-07 13:33:05 -05:00 |
|
GriffinR
|
934a7e7a5d
|
Merge pull request #1516 from GriffinRichards/doc-miscbattle
Miscellaneous battle documentation
|
2021-10-19 08:09:17 -04:00 |
|
GriffinR
|
28de627913
|
Add TRACKS_ALL, remove BGCntrlBitfield
|
2021-10-09 11:34:51 -04:00 |
|
GriffinR
|
d8e65fc4b6
|
More battle doc, add battle window ids
|
2021-10-09 03:01:10 -04:00 |
|
ultima-soul
|
be7acc919a
|
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-04-03 21:53:29 -07:00 |
|
GriffinR
|
b9c733495b
|
Document dodrio berry picking
|
2021-03-03 14:26:05 -05:00 |
|
DizzyEggg
|
448599f53c
|
Merge with master
|
2020-09-08 12:01:20 +02:00 |
|
GriffinR
|
dd26bfe274
|
Fix alignment in sFanfares
|
2020-08-31 13:38:43 -04:00 |
|
GriffinR
|
3014241179
|
Give songs meaningful english names
|
2020-08-20 19:06:14 -04:00 |
|
DizzyEggg
|
4881e48994
|
Merge with master
|
2019-08-04 23:57:53 +02:00 |
|
PikalaxALT
|
b839c21307
|
Fix/suppress warnings when building with gcc-8
|
2019-06-26 16:42:57 -04:00 |
|
DizzyEggg
|
62f9862c82
|
Fix cries for gen3 mons
|
2019-04-12 13:31:02 +02:00 |
|
DizzyEggg
|
27bafdc04d
|
Begin pokemon expansion
|
2019-04-02 21:22:16 +02:00 |
|
Phlosioneer
|
291df27dcb
|
Use new MUS_NONE constant in sound.c
|
2019-03-16 12:31:29 -05:00 |
|
Marcus Huderle
|
e81838dba3
|
Misc. documentation and move some data into .c files
|
2019-01-29 14:36:02 -06:00 |
|
DizzyEggg
|
9320fe8f85
|
Clear includes
|
2018-12-24 00:02:29 +01:00 |
|
Diegoisawesome
|
3241b1405f
|
Add symbols to music_player_table
Also rename gMPlay structs to gMPlayInfo
|
2018-01-09 21:30:54 -06:00 |
|
sceptillion
|
96511dc214
|
use internal song names
|
2017-12-22 00:10:20 -08:00 |
|
camthesaxman
|
c681b482c2
|
convert more constants
|
2017-12-11 12:27:51 -06:00 |
|
DizzyEggg
|
7ecdcc5ed8
|
iwram and ewram vars to C
|
2017-09-02 17:32:34 +02:00 |
|
DizzyEggg
|
591837e3c3
|
decompile sound.s
|
2017-09-02 17:03:46 +02:00 |
|
DizzyEggg
|
2089dd0f86
|
start labelling, decompiling sound.s
|
2017-09-02 16:03:53 +02:00 |
|