diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-24 20:50:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-24 20:50:53 -0500 |
| commit | 97d2555fad45c046862b97cf84c443b6935928a6 (patch) | |
| tree | 1db9378c01c951cb4a66a105a1a90701213397f8 /data/maps/SSAnne_2F_Room2/scripts.inc | |
| parent | c0be66fc2e0ace7a9004fcbebe3a7595c30cda87 (diff) | |
| parent | a09e66b53f61027d8805e5d6bb4df3d679693485 (diff) | |
Merge branch 'master' into doc-viridian
Diffstat (limited to 'data/maps/SSAnne_2F_Room2/scripts.inc')
| -rw-r--r-- | data/maps/SSAnne_2F_Room2/scripts.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/SSAnne_2F_Room2/scripts.inc b/data/maps/SSAnne_2F_Room2/scripts.inc index 6568baa0e..3968c2726 100644 --- a/data/maps/SSAnne_2F_Room2/scripts.inc +++ b/data/maps/SSAnne_2F_Room2/scripts.inc @@ -1,12 +1,12 @@ SSAnne_2F_Room2_MapScripts:: @ 8160CB0 .byte 0 -SSAnne_2F_Room2_EventScript_160CB1:: @ 8160CB1 - trainerbattle_single TRAINER_FISHERMAN_DALE, Text_173DDB, Text_173DF7 - msgbox gUnknown_8173E04, MSGBOX_AUTOCLOSE +SSAnne_2F_Room2_EventScript_Dale:: @ 8160CB1 + trainerbattle_single TRAINER_FISHERMAN_DALE, SSAnne_2F_Room2_Text_DaleIntro, SSAnne_2F_Room2_Text_DaleDefeat + msgbox SSAnne_2F_Room2_Text_DalePostBattle, MSGBOX_AUTOCLOSE end -SSAnne_2F_Room2_EventScript_160CC8:: @ 8160CC8 - trainerbattle_single TRAINER_GENTLEMAN_BROOKS, Text_173D63, Text_173D92 - msgbox gUnknown_8173DB6, MSGBOX_AUTOCLOSE +SSAnne_2F_Room2_EventScript_Brooks:: @ 8160CC8 + trainerbattle_single TRAINER_GENTLEMAN_BROOKS, SSAnne_2F_Room2_Text_BrooksIntro, SSAnne_2F_Room2_Text_BrooksDefeat + msgbox SSAnne_2F_Room2_Text_BrooksPostBattle, MSGBOX_AUTOCLOSE end |