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
|
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
|
7143865f6f
|
Add some battle frontier constant usage
|
2022-06-09 12:57:28 -04:00 |
|
ultima-soul
|
b0b8b9bf46
|
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-12-17 23:51:29 -08:00 |
|
ultima-soul
|
a8f9a54787
|
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
|
2021-11-21 10:41:32 -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
|
7f3c529935
|
Document record mixing mail swap
|
2021-10-24 15:49:19 -04:00 |
|
ultima-soul
|
53e900a643
|
Rearranged rest of item ids except for Key Items.
|
2021-07-02 22:43:50 -07:00 |
|
ultima-soul
|
56fc420187
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-04-28 21:34:30 -07:00 |
|
GriffinR
|
aad090e154
|
Document TV
|
2021-04-26 12:35:35 -04:00 |
|
ExpoSeed
|
7dadcb94b8
|
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
|
2021-01-03 17:14:43 -06:00 |
|
Tim Gates
|
581306db7b
|
docs: fix simple typo, redunant -> redundant
There is a small typo in include/constants/battle_frontier.h.
Should read `redundant` rather than `redunant`.
|
2020-12-13 22:14:50 +11:00 |
|
DizzyEggg
|
d8aab3d112
|
Merge with master
|
2020-01-18 18:17:25 +01:00 |
|
GriffinR
|
63c8cf97d1
|
Document Battle Dome scripts and some battle_dome.c
|
2019-12-20 16:53:33 -05:00 |
|
DizzyEggg
|
dcb5d16cb3
|
Merge with master
|
2019-11-29 21:47:31 +01:00 |
|
GriffinR
|
63ee15fc28
|
Document Frontier Util
|
2019-11-25 18:37:48 -06:00 |
|
GriffinR
|
4dfa959fa2
|
Begin documenting Battle Pike and Frontier Util
|
2019-11-25 18:37:48 -06:00 |
|
DizzyEggg
|
8cc0439182
|
merge master
|
2019-11-22 22:47:19 +01:00 |
|
GriffinR
|
6ac7efb54f
|
Document Scotts House and begin frontier macros
|
2019-11-17 08:16:28 -06:00 |
|
GriffinR
|
248b85c3cb
|
Document Frontier Exchange Corner scripts
|
2019-11-16 12:00:35 -06:00 |
|
DizzyEggg
|
1d8cc9b741
|
Fix merge conflicts
|
2019-11-03 19:55:19 +01:00 |
|
GriffinR
|
6db014cc32
|
Document party_menu first pass
|
2019-10-25 15:41:06 -04:00 |
|
DizzyEggg
|
bae5d2038f
|
Update with master
|
2019-10-10 16:18:48 +02:00 |
|
GriffinR
|
6ab49da811
|
Clean up field_specials documentation
|
2019-09-17 16:50:17 -05:00 |
|
GriffinR
|
aac9658a8e
|
Document some field_specials data
|
2019-09-17 16:50:17 -05:00 |
|
DizzyEggg
|
fddb5159b4
|
Merge with master
|
2019-03-05 21:46:45 +01:00 |
|
Phlosioneer
|
e75f45dbcf
|
Reverse engineered many of the multiplayer events
Some corrections to the way events are handled and identified.
|
2019-02-10 20:42:50 -05:00 |
|
DizzyEggg
|
4827776a3c
|
Merge with master
|
2019-01-05 10:14:20 +01:00 |
|
Marcus Huderle
|
e1092028ec
|
Decompile match_call.c
|
2019-01-02 19:46:15 -06:00 |
|
DizzyEggg
|
e54dd6a02b
|
Merge with master
|
2018-12-22 13:53:07 +01:00 |
|
garak
|
462e7c8295
|
begin batle tower data
|
2018-12-02 23:22:42 -05:00 |
|
DizzyEggg
|
539b05ff73
|
Begin working on custom multi battles
|
2018-11-24 01:02:02 +01:00 |
|
DizzyEggg
|
258ec3162f
|
frontier util review changes
|
2018-11-05 22:13:59 +01:00 |
|
DizzyEggg
|
549b669f2a
|
battle tower, match sth and dumb loop instead of goto
|
2018-10-24 23:14:45 +02:00 |
|
DizzyEggg
|
0ab27e44b1
|
more tower, fail
|
2018-10-21 20:13:12 +02:00 |
|
DizzyEggg
|
10eb952db5
|
Start battle factory
|
2018-09-02 18:10:36 +02:00 |
|
DizzyEggg
|
edcf04b665
|
Document battle dome.
|
2018-08-25 19:59:47 +02:00 |
|
DizzyEggg
|
d2e47323fe
|
document frontier related
|
2018-07-01 11:15:42 +02:00 |
|