diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-15 20:44:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-15 20:44:57 -0500 |
| commit | a4cd331634d1fcc5f7cb217c51c328c5769a9616 (patch) | |
| tree | 7b610171c3d893d1cace513cf61e0b74014dbad2 /data/maps/SSAnne_1F_Room2/scripts.inc | |
| parent | 34deceb13695e7b13a27ecb94666fc95d2ced550 (diff) | |
| parent | fee980decd6dfd5dc98c15ba13c9ea8f7b597934 (diff) | |
Merge branch 'master' into doc-ttower
Diffstat (limited to 'data/maps/SSAnne_1F_Room2/scripts.inc')
| -rw-r--r-- | data/maps/SSAnne_1F_Room2/scripts.inc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/SSAnne_1F_Room2/scripts.inc b/data/maps/SSAnne_1F_Room2/scripts.inc index 3a80d3cfe..10154e734 100644 --- a/data/maps/SSAnne_1F_Room2/scripts.inc +++ b/data/maps/SSAnne_1F_Room2/scripts.inc @@ -1,16 +1,16 @@ SSAnne_1F_Room2_MapScripts:: @ 8160BE5 .byte 0 -SSAnne_1F_Room2_EventScript_160BE6:: @ 8160BE6 - msgbox gUnknown_8173AC5, MSGBOX_NPC +SSAnne_1F_Room2_EventScript_Woman:: @ 8160BE6 + msgbox SSAnne_1F_Room2_Text_CruisingAroundWorld, MSGBOX_NPC end -SSAnne_1F_Room2_EventScript_160BEF:: @ 8160BEF - trainerbattle_single TRAINER_LASS_ANN, Text_173A1A, Text_173A4F - msgbox gUnknown_8173A7A, MSGBOX_AUTOCLOSE +SSAnne_1F_Room2_EventScript_Ann:: @ 8160BEF + trainerbattle_single TRAINER_LASS_ANN, SSAnne_1F_Room2_Text_AnnIntro, SSAnne_1F_Room2_Text_AnnDefeat + msgbox SSAnne_1F_Room2_Text_AnnPostBattle, MSGBOX_AUTOCLOSE end -SSAnne_1F_Room2_EventScript_160C06:: @ 8160C06 - trainerbattle_single TRAINER_YOUNGSTER_TYLER, Text_173999, Text_1739B1 - msgbox gUnknown_81739C5, MSGBOX_AUTOCLOSE +SSAnne_1F_Room2_EventScript_Tyler:: @ 8160C06 + trainerbattle_single TRAINER_YOUNGSTER_TYLER, SSAnne_1F_Room2_Text_TylerIntro, SSAnne_1F_Room2_Text_TylerDefeat + msgbox SSAnne_1F_Room2_Text_TylerPostBattle, MSGBOX_AUTOCLOSE end |