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_2F_Room1 | |
| parent | 34deceb13695e7b13a27ecb94666fc95d2ced550 (diff) | |
| parent | fee980decd6dfd5dc98c15ba13c9ea8f7b597934 (diff) | |
Merge branch 'master' into doc-ttower
Diffstat (limited to 'data/maps/SSAnne_2F_Room1')
| -rw-r--r-- | data/maps/SSAnne_2F_Room1/map.json | 2 | ||||
| -rw-r--r-- | data/maps/SSAnne_2F_Room1/scripts.inc | 4 | ||||
| -rw-r--r-- | data/maps/SSAnne_2F_Room1/text.inc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/SSAnne_2F_Room1/map.json b/data/maps/SSAnne_2F_Room1/map.json index eacfe5c91..20e221a85 100644 --- a/data/maps/SSAnne_2F_Room1/map.json +++ b/data/maps/SSAnne_2F_Room1/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_2F_Room1_EventScript_160C97", + "script": "SSAnne_2F_Room1_EventScript_Gentleman", "flag": "0" } ], diff --git a/data/maps/SSAnne_2F_Room1/scripts.inc b/data/maps/SSAnne_2F_Room1/scripts.inc index 9748777c7..a31c914c1 100644 --- a/data/maps/SSAnne_2F_Room1/scripts.inc +++ b/data/maps/SSAnne_2F_Room1/scripts.inc @@ -1,10 +1,10 @@ SSAnne_2F_Room1_MapScripts:: @ 8160C96 .byte 0 -SSAnne_2F_Room1_EventScript_160C97:: @ 8160C97 +SSAnne_2F_Room1_EventScript_Gentleman:: @ 8160C97 lock faceplayer - message Text_173CE3 + message SSAnne_2F_Room1_Text_SleepingMonLookedLikeThis waitmessage setvar VAR_0x8004, SPECIES_SNORLAX special Special_SetSeenMon diff --git a/data/maps/SSAnne_2F_Room1/text.inc b/data/maps/SSAnne_2F_Room1/text.inc index 5a18af424..c75f4adb7 100644 --- a/data/maps/SSAnne_2F_Room1/text.inc +++ b/data/maps/SSAnne_2F_Room1/text.inc @@ -1,4 +1,4 @@ -Text_173CE3:: @ 8173CE3 +SSAnne_2F_Room1_Text_SleepingMonLookedLikeThis:: @ 8173CE3 .string "I've journeyed far and wide, but in\n" .string "all my travels I've never seen\l" .string "any POKéMON sleep like this one!\p" |