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/SSTidalRooms/scripts.inc | |
| parent | 67242f5d0fae1c573d74117b3ce3cf9bef48489e (diff) | |
| parent | fce8a1b817d2033d2203c341dfa12d1115f564ca (diff) | |
Merge pull request #11 from pret/master
merge with source repo
Diffstat (limited to 'data/maps/SSTidalRooms/scripts.inc')
| -rw-r--r-- | data/maps/SSTidalRooms/scripts.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc index 89372bd84..52927d54e 100644 --- a/data/maps/SSTidalRooms/scripts.inc +++ b/data/maps/SSTidalRooms/scripts.inc @@ -29,36 +29,36 @@ SSTidalRooms_EventScript_15FF47:: @ 815FF47 end SSTidalRooms_EventScript_15FF5D:: @ 815FF5D - trainerbattle 0, OPPONENT_COLTON, 0, SSTidalRooms_Text_19958A, SSTidalRooms_Text_199613 + trainerbattle 0, TRAINER_COLTON, 0, SSTidalRooms_Text_19958A, SSTidalRooms_Text_199613 msgbox SSTidalRooms_Text_199630, 6 end SSTidalRooms_EventScript_15FF74:: @ 815FF74 - trainerbattle 0, OPPONENT_TUCKER, 0, SSTidalRooms_Text_1996A6, SSTidalRooms_Text_1996BF + trainerbattle 0, TRAINER_TUCKER, 0, SSTidalRooms_Text_1996A6, SSTidalRooms_Text_1996BF msgbox SSTidalRooms_Text_1996E1, 6 end SSTidalRooms_EventScript_15FF8B:: @ 815FF8B - trainerbattle 0, OPPONENT_THOMAS, 0, SSTidalRooms_Text_199723, SSTidalRooms_Text_199747 + trainerbattle 0, TRAINER_THOMAS, 0, SSTidalRooms_Text_199723, SSTidalRooms_Text_199747 msgbox SSTidalRooms_Text_199778, 6 end SSTidalRooms_EventScript_15FFA2:: @ 815FFA2 - trainerbattle 4, OPPONENT_LEA_AND_JED, 0, SSTidalRooms_Text_1997C1, SSTidalRooms_Text_199813, SSTidalRooms_Text_199887 + trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_1997C1, SSTidalRooms_Text_199813, SSTidalRooms_Text_199887 msgbox SSTidalRooms_Text_199820, 6 end SSTidalRooms_EventScript_15FFBD:: @ 815FFBD - trainerbattle 4, OPPONENT_LEA_AND_JED, 0, SSTidalRooms_Text_1998C5, SSTidalRooms_Text_19990E, SSTidalRooms_Text_199975 + trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_1998C5, SSTidalRooms_Text_19990E, SSTidalRooms_Text_199975 msgbox SSTidalRooms_Text_19991C, 6 end SSTidalRooms_EventScript_15FFD8:: @ 815FFD8 - trainerbattle 0, OPPONENT_GARRET, 0, SSTidalRooms_Text_1999B7, SSTidalRooms_Text_1999FF + trainerbattle 0, TRAINER_GARRET, 0, SSTidalRooms_Text_1999B7, SSTidalRooms_Text_1999FF msgbox SSTidalRooms_Text_199A10, 6 end SSTidalRooms_EventScript_15FFEF:: @ 815FFEF - trainerbattle 0, OPPONENT_ANETTE, 0, SSTidalRooms_Text_199A62, SSTidalRooms_Text_199ABF + trainerbattle 0, TRAINER_ANETTE, 0, SSTidalRooms_Text_199A62, SSTidalRooms_Text_199ABF msgbox SSTidalRooms_Text_199ADE, 6 end |