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
Martin Griffin
c9958e3087
Simplify GetBattleTransitionTypeByMap
2022-07-05 14:17:46 +01:00
ultima-soul
23bf41713c
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-12-01 20:17:08 -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
61aa9c3ba9
More updating event macro comments
2021-11-16 17:46:34 -05:00
GriffinR
04cc923d6c
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
GriffinR
c1130592fa
Drop some overworld prefixes
2021-11-15 10:58:05 -05:00
Eduardo Quezada D'Ottone
b282bbc270
Using WEATHER_SANDSTORM in battle_setup
2021-11-06 14:55:27 -03:00
GriffinR
0ba22ca112
Merge pull request #1534 from GriffinRichards/doc-btrans
...
Document battle transition
2021-11-03 11:26:20 -04:00
GriffinR
07bf225f94
Continue battle_transition documenting
2021-10-29 11:24:36 -04:00
cbt6
b3d779fd0d
Document field player functions
2021-10-27 01:39:00 +08:00
GriffinR
1056209d8e
Start battle_transition documenting
2021-10-26 01:39:28 -04:00
GriffinR
6dc3c9864c
Merge pull request #1520 from GriffinRichards/doc-random
...
Document random remaining symbols
2021-10-24 23:43:17 -04:00
GriffinR
b31bddddca
Clean up metatile_behavior
2021-10-18 12:54:29 -04:00
GriffinR
31b501e7eb
Start misc battle documentation
2021-10-08 16:39:46 -04:00
LOuroboros
554210c5e3
Removed trailing spaces in the most relevant files
...
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include *.s --include *.inc --include *.txt * | xargs sed -i 's/\s\+$//g'
Credits to Grant Murphy from Stack Overflow.
2021-08-24 19:59:32 -03:00
ultima-soul
5bab9474dc
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-03-22 23:08:19 -07: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
9e59581220
Document object lock and some trainer approach
2021-01-26 04:42:18 -05:00
ExpoSeed
7dadcb94b8
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2021-01-03 17:14:43 -06:00
GriffinR
88e951bfe3
Label some ReturnToField funcs
2021-01-01 17:11:06 -05:00
Kurausukun
58976ebaa8
Merge remote-tracking branch 'upstream/master' into berry_crush
2020-12-10 23:30:52 -05:00
Aaron B-D
b83a87c8e8
Added scripted double wild battles
2020-10-19 14:47:32 -04:00
ExpoSeed
9e2c8a95c1
Sync bev2 with pret
2020-10-11 01:01:47 -05:00
GriffinR
5259898325
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
Kaz
171154a097
Convert to -g; will be required for eliminating fakematches.
2020-09-16 19:36:30 -04:00
DizzyEggg
97d0643110
Merge with master
2020-09-08 12:48:28 +02:00
DizzyEggg
f70a9ce153
Merge with master
2020-08-27 12:01:28 +02:00
GriffinR
ee72696b53
Sync encounter musics with encounter music types
2020-08-20 21:03:24 -04:00
GriffinR
3014241179
Give songs meaningful english names
2020-08-20 19:06:14 -04:00
GriffinR
65bd2faf94
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest
2020-08-16 05:59:10 -04:00
GriffinR
3779422489
Split contest funcs from script_pokemon_util
2020-08-13 17:42:12 -04:00
DizzyEggg
0066640a1e
Merge with master
2020-07-27 14:51:39 +02:00
DizzyEggg
4c3f40a361
Merge with master
2020-07-11 12:59:23 +02:00
GriffinR
72edc46ab6
Document unk_transition
2020-07-02 15:45:37 -04:00
GriffinR
aaf5d91c18
Document field_message_box.c
2020-06-03 19:47:45 -05:00
DizzyEggg
5db3449b50
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2
2020-03-06 11:40:41 +01:00
GriffinR
b6c9ad505d
Minor fixes in trainer_battle.inc
2020-03-03 14:47:14 -05:00
DizzyEggg
108f6b711f
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2
2020-02-23 10:58:26 +01:00
GriffinR
956090b05f
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-02-12 13:05:57 -05:00
GriffinR
084bd66924
Document Trainer Card
2020-02-08 14:31:17 -06:00
DizzyEggg
d8aab3d112
Merge with master
2020-01-18 18:17:25 +01:00
GriffinR
655910a16f
Merge branch 'master' into fix-eventobj
2020-01-12 22:42:43 -05:00
GriffinR
635267ce32
Merge branch 'master' into fix-eventobj
2020-01-08 05:51:49 -05:00
GriffinR
e5df61e362
Merge branch 'master' into doc-dome
2020-01-08 01:15:36 -05:00
DizzyEggg
4c9ea32d19
Merge with master
2019-12-30 18:52:23 +01:00
Fontbane
31b4656324
Labels better
2019-12-25 22:39:06 -05:00
DizzyEggg
9e3d5672e6
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2
2019-12-23 16:40:21 +01:00
GriffinR
ff2d8a9c4e
Add frontier trainer constants
2019-12-20 21:14:05 -05:00
GriffinR
db8a5c6c2b
Merge branch 'master' into fix-eventobj
2019-12-15 11:47:27 -05:00
