diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-16 12:07:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-16 12:07:24 -0500 |
| commit | 01de877fc86e8fe369314b7bda490b610342af6f (patch) | |
| tree | 996f86f889d7977b7210b15ebba6fef61748cc40 /data/maps/RocketHideout_B3F/scripts.inc | |
| parent | b4fce4020d218e9c246fda91339e660a46182393 (diff) | |
| parent | b6899a0de1d64b97bcbaa4239b1d87ced98d005a (diff) | |
Merge branch 'master' into doc-tilesets
Diffstat (limited to 'data/maps/RocketHideout_B3F/scripts.inc')
| -rw-r--r-- | data/maps/RocketHideout_B3F/scripts.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/RocketHideout_B3F/scripts.inc b/data/maps/RocketHideout_B3F/scripts.inc index d6a57ab77..ab1fd6bb3 100644 --- a/data/maps/RocketHideout_B3F/scripts.inc +++ b/data/maps/RocketHideout_B3F/scripts.inc @@ -1,12 +1,12 @@ RocketHideout_B3F_MapScripts:: @ 81612B9 .byte 0 -RocketHideout_B3F_EventScript_1612BA:: @ 81612BA - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_14, Text_17511A, Text_17514A - msgbox gUnknown_817515B, MSGBOX_AUTOCLOSE +RocketHideout_B3F_EventScript_Grunt1:: @ 81612BA + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_14, RocketHideout_B3F_Text_Grunt1Intro, RocketHideout_B3F_Text_Grunt1Defeat + msgbox RocketHideout_B3F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -RocketHideout_B3F_EventScript_1612D1:: @ 81612D1 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_15, Text_17519E, Text_1751CE - msgbox gUnknown_81751E0, MSGBOX_AUTOCLOSE +RocketHideout_B3F_EventScript_Grunt2:: @ 81612D1 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_15, RocketHideout_B3F_Text_Grunt2Intro, RocketHideout_B3F_Text_Grunt2Defeat + msgbox RocketHideout_B3F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end |