diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-06 00:06:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-06 00:06:11 -0500 |
| commit | cf7eec3bdeeaa9ace0bba7db87c0c71bd48915ba (patch) | |
| tree | 3209f6cb5cd2f1119f438bf9642347622c22db80 /maps/TeamRocketBaseB2F.asm | |
| parent | 08ddbe843b6d29c0901ff5f0862cbb5a57b557d7 (diff) | |
| parent | 15015e48779386ae01fe3b3a07a0b776f9933f60 (diff) | |
Merge pull request #404 from surskitty/master
De-Magic-Numbers the Rocket Grunts
Diffstat (limited to 'maps/TeamRocketBaseB2F.asm')
| -rw-r--r-- | maps/TeamRocketBaseB2F.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 25994fc92..26adc801b 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -194,7 +194,7 @@ UnknownScript_0x6d0be: end TrainerGruntM17: - trainer EVENT_BEAT_ROCKET_GRUNTM_17, GRUNTM, 17, GruntM17SeenText, GruntM17BeatenText, 0, GruntM17Script + trainer EVENT_BEAT_ROCKET_GRUNTM_17, GRUNTM, GRUNTM_17, GruntM17SeenText, GruntM17BeatenText, 0, GruntM17Script GruntM17Script: end_if_just_battled @@ -205,7 +205,7 @@ GruntM17Script: end TrainerGruntM18: - trainer EVENT_BEAT_ROCKET_GRUNTM_18, GRUNTM, 18, GruntM18SeenText, GruntM18BeatenText, 0, GruntM18Script + trainer EVENT_BEAT_ROCKET_GRUNTM_18, GRUNTM, GRUNTM_18, GruntM18SeenText, GruntM18BeatenText, 0, GruntM18Script GruntM18Script: end_if_just_battled @@ -216,7 +216,7 @@ GruntM18Script: end TrainerGruntM19: - trainer EVENT_BEAT_ROCKET_GRUNTM_19, GRUNTM, 19, GruntM19SeenText, GruntM19BeatenText, 0, GruntM19Script + trainer EVENT_BEAT_ROCKET_GRUNTM_19, GRUNTM, GRUNTM_19, GruntM19SeenText, GruntM19BeatenText, 0, GruntM19Script GruntM19Script: end_if_just_battled |