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_Room5 | |
| parent | 34deceb13695e7b13a27ecb94666fc95d2ced550 (diff) | |
| parent | fee980decd6dfd5dc98c15ba13c9ea8f7b597934 (diff) | |
Merge branch 'master' into doc-ttower
Diffstat (limited to 'data/maps/SSAnne_2F_Room5')
| -rw-r--r-- | data/maps/SSAnne_2F_Room5/map.json | 4 | ||||
| -rw-r--r-- | data/maps/SSAnne_2F_Room5/scripts.inc | 8 | ||||
| -rw-r--r-- | data/maps/SSAnne_2F_Room5/text.inc | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/SSAnne_2F_Room5/map.json b/data/maps/SSAnne_2F_Room5/map.json index 87a4b8adc..0821d13bd 100644 --- a/data/maps/SSAnne_2F_Room5/map.json +++ b/data/maps/SSAnne_2F_Room5/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_2F_Room5_EventScript_160D22", + "script": "SSAnne_2F_Room5_EventScript_Gentleman", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SSAnne_2F_Room5_EventScript_160D2B", + "script": "SSAnne_2F_Room5_EventScript_LittleBoy", "flag": "0" } ], diff --git a/data/maps/SSAnne_2F_Room5/scripts.inc b/data/maps/SSAnne_2F_Room5/scripts.inc index 9635b4bf7..2a02c6d91 100644 --- a/data/maps/SSAnne_2F_Room5/scripts.inc +++ b/data/maps/SSAnne_2F_Room5/scripts.inc @@ -1,10 +1,10 @@ SSAnne_2F_Room5_MapScripts:: @ 8160D21 .byte 0 -SSAnne_2F_Room5_EventScript_160D22:: @ 8160D22 - msgbox gUnknown_8173FF7, MSGBOX_NPC +SSAnne_2F_Room5_EventScript_Gentleman:: @ 8160D22 + msgbox SSAnne_2F_Room5_Text_HaveYouGoneToSafariZone, MSGBOX_NPC end -SSAnne_2F_Room5_EventScript_160D2B:: @ 8160D2B - msgbox gUnknown_817404F, MSGBOX_NPC +SSAnne_2F_Room5_EventScript_LittleBoy:: @ 8160D2B + msgbox SSAnne_2F_Room5_Text_WeThinkSafariZoneIsAwesome, MSGBOX_NPC end diff --git a/data/maps/SSAnne_2F_Room5/text.inc b/data/maps/SSAnne_2F_Room5/text.inc index 75d44d3a5..7aa3e2ade 100644 --- a/data/maps/SSAnne_2F_Room5/text.inc +++ b/data/maps/SSAnne_2F_Room5/text.inc @@ -1,10 +1,10 @@ -gUnknown_8173FF7:: @ 8173FF7 +SSAnne_2F_Room5_Text_HaveYouGoneToSafariZone:: @ 8173FF7 .string "Have you gone to the SAFARI ZONE\n" .string "in FUCHSIA CITY?\p" .string "There are many kinds of rare\n" .string "POKéMON.$" -gUnknown_817404F:: @ 817404F +SSAnne_2F_Room5_Text_WeThinkSafariZoneIsAwesome:: @ 817404F .string "Me and my daddy think the SAFARI\n" .string "ZONE is awesome!\l" .string "I wish we could go there again.$" |