Eduardo Quezada
0d5b00aaf2
Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829
...
# Conflicts:
# README.md
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# data/maps/BattleFrontier_Lounge7/scripts.inc
# include/battle_anim.h
# include/battle_message.h
# include/constants/items.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_anim_throw.c
# src/battle_anim_utility_funcs.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_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/data/party_menu.h
# src/data/pokemon/tmhm_learnsets.h
# src/daycare.c
# src/field_specials.c
# src/hall_of_fame.c
# src/party_menu.c
# src/pokemon.c
# src/tv.c
2023-08-31 14:28:01 -04:00
GriffinR
866c32a735
Add temp var aliases
2023-08-04 14:17:28 -04:00
Eduardo Quezada
de32940fdf
Further removed trailing whitespaces
2022-09-13 16:26:36 -03: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
42a83ee50e
Use STR_VAR names for apprentice_buff and frontier_gettrainername
2021-11-18 23:20:05 -05: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
ExpoSeed
7dadcb94b8
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2021-01-03 17:14:43 -06:00
GriffinR
769ddf22c2
Label remaining subs in battle_tower.c
2020-12-24 16:18:47 -05:00
DizzyEggg
017f65de59
Add easy to use macros for custom multi battles
2020-02-16 15:45:54 +01:00
GriffinR
e5df61e362
Merge branch 'master' into doc-dome
2020-01-08 01:15:36 -05:00
GriffinR
fb5bea98ce
More battle_dome.c doc
2020-01-07 22:30:37 -05:00
GriffinR
3efc8199d4
More battle_dome.c documentation
2019-12-25 22:27:33 -08:00
GriffinR
63c8cf97d1
Document Battle Dome scripts and some battle_dome.c
2019-12-20 16:53:33 -05:00
GriffinR
23f952b34e
Merge master into doc-tower
2019-12-17 21:17:46 -05:00
GriffinR
ddfa0c6298
Document Battle Tower scripts
2019-12-17 20:56:13 -05:00
GriffinR
75b0c9d7a9
Document Battle Pyramid scripts
2019-12-14 08:38:26 -06:00
GriffinR
aa72c0ada3
Document Battle Factory scripts
2019-12-14 08:32:32 -06:00
GriffinR
49f1a90534
Document Battle Pike scripts
2019-12-10 19:31:27 -06:00
GriffinR
49c6ae1ac6
Add some macro comments
2019-12-05 21:11:17 -06:00
GriffinR
fdae25eab2
Set up Battle Pyramid macros
2019-12-05 21:11:17 -06:00
GriffinR
9fcfbdbef5
Set up Battle Factory macros
2019-12-05 21:11:17 -06:00
GriffinR
41c1c9ca8a
Set up Battle Pike macros
2019-12-05 21:11:17 -06:00
GriffinR
9b3d1cfab6
Set up Battle Dome and Tower macros
2019-12-05 21:11:17 -06:00
GriffinR
be17c1602d
Set up remaining facility script doc, use Palace macros
2019-12-05 21:11:17 -06:00
GriffinR
70d1f54ab9
Remove TODO comment for battle arena macros
2019-11-26 18:47:48 -06:00
GriffinR
8d870d94c9
Document Battle Arena scripts
2019-11-26 18:47:48 -06:00
GriffinR
cc81b5032b
Split frontier macros and comment frontier_util.inc
2019-11-25 18:37:48 -06:00