diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-23 02:52:56 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-23 02:52:56 -0500 |
| commit | d4f32c10a832899d4a28e658d1d48356ec4fa29e (patch) | |
| tree | a641fc9d0bafd3a2eab4660bb925c5100696aa01 /data/maps/SSAnne_2F_Room2 | |
| parent | c2bf9898a533a0b0cd2bba346e3df8c6f300f016 (diff) | |
Document SS Anne scripts
Diffstat (limited to 'data/maps/SSAnne_2F_Room2')
| -rw-r--r-- | data/maps/SSAnne_2F_Room2/map.json | 4 | ||||
| -rw-r--r-- | data/maps/SSAnne_2F_Room2/scripts.inc | 12 | ||||
| -rw-r--r-- | data/maps/SSAnne_2F_Room2/text.inc | 12 |
3 files changed, 14 insertions, 14 deletions
diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json index e01f65eb5..df5cf4bc8 100644 --- a/data/maps/SSAnne_2F_Room2/map.json +++ b/data/maps/SSAnne_2F_Room2/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SSAnne_2F_Room2_EventScript_160CB1", + "script": "SSAnne_2F_Room2_EventScript_Dale", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SSAnne_2F_Room2_EventScript_160CC8", + "script": "SSAnne_2F_Room2_EventScript_Brooks", "flag": "0" }, { 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 diff --git a/data/maps/SSAnne_2F_Room2/text.inc b/data/maps/SSAnne_2F_Room2/text.inc index a931a8e47..e7fb8ea8a 100644 --- a/data/maps/SSAnne_2F_Room2/text.inc +++ b/data/maps/SSAnne_2F_Room2/text.inc @@ -1,22 +1,22 @@ -Text_173D63:: @ 8173D63 +SSAnne_2F_Room2_Text_BrooksIntro:: @ 8173D63 .string "Competing against the young keeps\n" .string "me youthful.$" -Text_173D92:: @ 8173D92 +SSAnne_2F_Room2_Text_BrooksDefeat:: @ 8173D92 .string "Good match!\n" .string "Ah, I feel young again!$" -gUnknown_8173DB6:: @ 8173DB6 +SSAnne_2F_Room2_Text_BrooksPostBattle:: @ 8173DB6 .string "Fifteen years ago, I would\n" .string "have won!$" -Text_173DDB:: @ 8173DDB +SSAnne_2F_Room2_Text_DaleIntro:: @ 8173DDB .string "Check out what I fished up!$" -Text_173DF7:: @ 8173DF7 +SSAnne_2F_Room2_Text_DaleDefeat:: @ 8173DF7 .string "I'm all out!$" -gUnknown_8173E04:: @ 8173E04 +SSAnne_2F_Room2_Text_DalePostBattle:: @ 8173E04 .string "Party?\p" .string "The cruise ship's party should be\n" .string "over by now.$" |