Commit Graph

17 Commits

Author SHA1 Message Date
Eduardo Quezada
9241dc6fe7 Merge remote-tracking branch 'pret/master' into pokefirered_pokeemeraldSync4
# Conflicts:
#	include/battle.h
#	include/cable_club.h
#	src/battle_anim_fire.c
#	src/battle_anim_ghost.c
#	src/battle_anim_ground.c
#	src/battle_message.c
#	src/cable_club.c
2022-09-04 17:44:13 -03:00
Eduardo Quezada
616ab63d94 More sync with battle controllers 2022-08-20 16:13:03 -04:00
GriffinR
08a18d6e32 Sync/update trainer classes 2022-01-10 13:48:08 -05:00
GriffinR
1f6dc0e86b Use trainer constants in flags, automatically update flags/vars count 2021-01-29 15:50:01 -05:00
PikalaxALT
13e1ed54b2 battle_message 1 2019-11-23 16:51:05 -05:00
PikalaxALT
64485f5cd1 TRAINER_SECRET_BASE propagation 2019-11-07 09:23:21 -05:00
jiangzhengwenjz
1dc0b25c1e Merge branch 'master' into battle 2019-10-24 01:42:52 +08:00
PikalaxALT
d7d93b22d2 Trainer constants in vs_seeker.c 2019-10-21 13:03:30 -04:00
PikalaxALT
7e8da8845b Rename rival trainer constants 2019-10-21 11:06:53 -04:00
PikalaxALT
2f0ae810f7 Merge branch 'master' into trainers 2019-10-17 21:26:00 -04:00
PikalaxALT
2435bcc09d sys flag rearrange 2019-10-17 21:24:47 -04:00
PikalaxALT
97dc0a6903 Trainer dump pass 2; flag refactoring 2019-10-17 17:11:34 -04:00
PikalaxALT
0b708aeade Initial trainers dump 2019-10-17 16:13:02 -04:00
ultima-soul
5f6672ee07 Rename trainer front pics and palettes. 2019-10-16 22:52:41 -07:00
jiangzhengwenjz
f03807931f thru sub_8011B94 2019-10-17 02:01:07 +08:00
ultima-soul
29d7f1c737 Added TRAINER_PIC constants. 2019-10-16 00:04:07 -07:00
jiangzhengwenjz
184066d1c1 thru atk6B 2019-08-26 14:38:40 +08:00