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_B1F_Room1 | |
| parent | c2bf9898a533a0b0cd2bba346e3df8c6f300f016 (diff) | |
Document SS Anne scripts
Diffstat (limited to 'data/maps/SSAnne_B1F_Room1')
| -rw-r--r-- | data/maps/SSAnne_B1F_Room1/map.json | 4 | ||||
| -rw-r--r-- | data/maps/SSAnne_B1F_Room1/scripts.inc | 12 | ||||
| -rw-r--r-- | data/maps/SSAnne_B1F_Room1/text.inc | 12 |
3 files changed, 14 insertions, 14 deletions
diff --git a/data/maps/SSAnne_B1F_Room1/map.json b/data/maps/SSAnne_B1F_Room1/map.json index a5fa829d4..4608e6c9a 100644 --- a/data/maps/SSAnne_B1F_Room1/map.json +++ b/data/maps/SSAnne_B1F_Room1/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SSAnne_B1F_Room1_EventScript_160D48", + "script": "SSAnne_B1F_Room1_EventScript_Barny", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SSAnne_B1F_Room1_EventScript_160D5F", + "script": "SSAnne_B1F_Room1_EventScript_Phillip", "flag": "0" } ], diff --git a/data/maps/SSAnne_B1F_Room1/scripts.inc b/data/maps/SSAnne_B1F_Room1/scripts.inc index 44cb7d2d1..eb35be89e 100644 --- a/data/maps/SSAnne_B1F_Room1/scripts.inc +++ b/data/maps/SSAnne_B1F_Room1/scripts.inc @@ -1,12 +1,12 @@ SSAnne_B1F_Room1_MapScripts:: @ 8160D47 .byte 0 -SSAnne_B1F_Room1_EventScript_160D48:: @ 8160D48 - trainerbattle_single TRAINER_FISHERMAN_BARNY, Text_174177, Text_1741EF - msgbox gUnknown_817420E, MSGBOX_AUTOCLOSE +SSAnne_B1F_Room1_EventScript_Barny:: @ 8160D48 + trainerbattle_single TRAINER_FISHERMAN_BARNY, SSAnne_B1F_Room1_Text_BarnyIntro, SSAnne_B1F_Room1_Text_BarnyDefeat + msgbox SSAnne_B1F_Room1_Text_BarnyPostBattle, MSGBOX_AUTOCLOSE end -SSAnne_B1F_Room1_EventScript_160D5F:: @ 8160D5F - trainerbattle_single TRAINER_SAILOR_PHILLIP, Text_1740F6, Text_174123 - msgbox gUnknown_817413A, MSGBOX_AUTOCLOSE +SSAnne_B1F_Room1_EventScript_Phillip:: @ 8160D5F + trainerbattle_single TRAINER_SAILOR_PHILLIP, SSAnne_B1F_Room1_Text_PhillipIntro, SSAnne_B1F_Room1_Text_PhillipDefeat + msgbox SSAnne_B1F_Room1_Text_PhillipPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_B1F_Room1/text.inc b/data/maps/SSAnne_B1F_Room1/text.inc index 2802e4a84..bdd4b753c 100644 --- a/data/maps/SSAnne_B1F_Room1/text.inc +++ b/data/maps/SSAnne_B1F_Room1/text.inc @@ -1,26 +1,26 @@ -Text_1740F6:: @ 81740F6 +SSAnne_B1F_Room1_Text_PhillipIntro:: @ 81740F6 .string "Matey, you're walking the plank if\n" .string "you lose!$" -Text_174123:: @ 8174123 +SSAnne_B1F_Room1_Text_PhillipDefeat:: @ 8174123 .string "Argh!\n" .string "Beaten by a kid!$" -gUnknown_817413A:: @ 817413A +SSAnne_B1F_Room1_Text_PhillipPostBattle:: @ 817413A .string "When we're out at sea, jellyfish\n" .string "POKéMON sometimes drift by.$" -Text_174177:: @ 8174177 +SSAnne_B1F_Room1_Text_BarnyIntro:: @ 8174177 .string "Hello, stranger!\p" .string "I can't tell if you're from the seas\n" .string "or mountains, but stop and chat.\p" .string "All my POKéMON are from the sea.$" -Text_1741EF:: @ 81741EF +SSAnne_B1F_Room1_Text_BarnyDefeat:: @ 81741EF .string "Darn!\n" .string "I let that one get away!$" -gUnknown_817420E:: @ 817420E +SSAnne_B1F_Room1_Text_BarnyPostBattle:: @ 817420E .string "I was going to make you my\n" .string "assistant, too!$" |