diff options
| author | Garak <garakmon@gmail.com> | 2018-08-08 12:19:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-08 12:19:07 -0400 |
| commit | 4ebe2448a4dff2e36ca3c11496c68bcf3767b6cc (patch) | |
| tree | c19885fa4e4801de0f777efe1adfe7db34893a44 /data/maps/AquaHideout_B2F/scripts.inc | |
| parent | 67242f5d0fae1c573d74117b3ce3cf9bef48489e (diff) | |
| parent | fce8a1b817d2033d2203c341dfa12d1115f564ca (diff) | |
Merge pull request #11 from pret/master
merge with source repo
Diffstat (limited to 'data/maps/AquaHideout_B2F/scripts.inc')
| -rw-r--r-- | data/maps/AquaHideout_B2F/scripts.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index 37830a00e..103de2313 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -25,7 +25,7 @@ MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD AquaHideout_B2F_EventScript_15D8E1:: @ 815D8E1 MagmaHideout_B2F_EventScript_15D8E1:: @ 815D8E1 - trainerbattle 2, OPPONENT_HIDEOUT_B2F_GRUNT_1, 0, AquaHideout_B2F_Text_197093, AquaHideout_B2F_Text_197145, AquaHideout_B2F_EventScript_15D8FD + trainerbattle 2, TRAINER_HIDEOUT_B2F_GRUNT_1, 0, AquaHideout_B2F_Text_197093, AquaHideout_B2F_Text_197145, AquaHideout_B2F_EventScript_15D8FD msgbox AquaHideout_B2F_Text_1971AE, 4 release end @@ -85,7 +85,7 @@ AquaHideout_B2F_Movement_15D95D:: @ 815D95D AquaHideout_B2F_EventScript_15D962:: @ 815D962 MagmaHideout_B2F_EventScript_15D962:: @ 815D962 - trainerbattle 2, OPPONENT_HIDEOUT_B2F_GRUNT_2, 0, AquaHideout_B2F_Text_197270, AquaHideout_B2F_Text_1972AC, AquaHideout_B2F_EventScript_15D97D + trainerbattle 2, TRAINER_HIDEOUT_B2F_GRUNT_2, 0, AquaHideout_B2F_Text_197270, AquaHideout_B2F_Text_1972AC, AquaHideout_B2F_EventScript_15D97D msgbox AquaHideout_B2F_Text_1972D2, 6 end @@ -96,6 +96,6 @@ AquaHideout_B2F_EventScript_15D97D:: @ 815D97D AquaHideout_B2F_EventScript_15D987:: @ 815D987 MagmaHideout_B2F_EventScript_15D987:: @ 815D987 - trainerbattle 0, OPPONENT_HIDEOUT_B2F_GRUNT_3, 0, AquaHideout_B2F_Text_1972EF, AquaHideout_B2F_Text_197390 + trainerbattle 0, TRAINER_HIDEOUT_B2F_GRUNT_3, 0, AquaHideout_B2F_Text_1972EF, AquaHideout_B2F_Text_197390 msgbox AquaHideout_B2F_Text_1973C0, 6 end |