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
18319e8da3
Misc missing constant use
2023-08-10 01:42:18 -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
DizzyEggg
f70a9ce153
Merge with master
2020-08-27 12:01:28 +02:00
GriffinR
469ec5f248
Document contest AI commands
2020-08-21 02:36:48 -04:00
GriffinR
fa29ff98a3
Add condition mod constants
2020-08-18 11:38:50 -04:00
GriffinR
2749948eeb
Clean up contest doc
2020-08-16 05:52:17 -04:00
GriffinR
9f4525666d
Document misc contest
2020-08-16 02:50:35 -04:00
GriffinR
c42c1ab8c1
Document contest appeal
2020-08-15 14:32:30 -04:00
GriffinR
aca50c87be
Continue new contest documentation
2020-07-24 00:14:53 -04:00
GriffinR
52a4428ba6
Begin new contest documentation
2020-07-23 17:55:40 -04:00
MandL27
2c9ee80004
Gen 4+ moves get contest effects ( #319 )
...
* Add contest move effects
* Fix constants and also fix some laughable combo coding
* comment usum moves for cleaner merge
* clean up gitignore
* revert gitignore
* also revert moves.h because I'm bad at reading messages
* add some missing effects because the spreadsheet I sourced is bad
2020-04-13 15:05:10 +02:00
DizzyEggg
2646f3b26a
Merge with master
2019-04-13 13:42:44 +02:00
Phlosioneer
50da52c29b
Fix utf8 errors in contest_effect's comments
2019-04-04 16:00:25 -04:00
Phlosioneer
99e8e8e53f
More cleanup, document contestant sorting
2019-04-02 20:00:05 -04:00
Phlosioneer
c3200c0beb
Cleanup some of gContestResources
2019-04-02 00:35:57 -04:00
DizzyEggg
470df386c9
Fix conflicts
2018-12-07 23:01:14 +01:00
DizzyEggg
5dd1afd383
contest effect review changes
2018-08-16 22:55:36 +02:00
DizzyEggg
ba225f8eaa
Fix fakematching in contest effect
2018-08-15 00:25:19 +02:00
DizzyEggg
0c7063c5ba
Make contest effect table easier to edit in the future
2018-08-14 23:50:58 +02:00
DizzyEggg
c72b55a5c4
Match the worst function ever
2018-08-14 22:28:25 +02:00
DizzyEggg
1a0e6f7aed
match contest effect
2018-08-13 21:24:11 +02:00
DizzyEggg
0d68af7f06
copy contest effect from ruby
2018-08-12 23:20:17 +02:00
