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_1F_Room2 | |
| parent | c2bf9898a533a0b0cd2bba346e3df8c6f300f016 (diff) | |
Document SS Anne scripts
Diffstat (limited to 'data/maps/SSAnne_1F_Room2')
| -rw-r--r-- | data/maps/SSAnne_1F_Room2/map.json | 6 | ||||
| -rw-r--r-- | data/maps/SSAnne_1F_Room2/scripts.inc | 16 | ||||
| -rw-r--r-- | data/maps/SSAnne_1F_Room2/text.inc | 14 |
3 files changed, 18 insertions, 18 deletions
diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json index db08152f0..8a779f450 100644 --- a/data/maps/SSAnne_1F_Room2/map.json +++ b/data/maps/SSAnne_1F_Room2/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "SSAnne_1F_Room2_EventScript_160BEF", + "script": "SSAnne_1F_Room2_EventScript_Ann", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SSAnne_1F_Room2_EventScript_160C06", + "script": "SSAnne_1F_Room2_EventScript_Tyler", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 1, - "script": "SSAnne_1F_Room2_EventScript_160BE6", + "script": "SSAnne_1F_Room2_EventScript_Woman", "flag": "0" }, { 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 diff --git a/data/maps/SSAnne_1F_Room2/text.inc b/data/maps/SSAnne_1F_Room2/text.inc index 92dc9a93c..55daa017f 100644 --- a/data/maps/SSAnne_1F_Room2/text.inc +++ b/data/maps/SSAnne_1F_Room2/text.inc @@ -1,31 +1,31 @@ -Text_173999:: @ 8173999 +SSAnne_1F_Room2_Text_TylerIntro:: @ 8173999 .string "I love POKéMON!\n" .string "Do you?$" -Text_1739B1:: @ 81739B1 +SSAnne_1F_Room2_Text_TylerDefeat:: @ 81739B1 .string "Wow! \n" .string "You're great!$" -gUnknown_81739C5:: @ 81739C5 +SSAnne_1F_Room2_Text_TylerPostBattle:: @ 81739C5 .string "Listen, listen!\n" .string "Let me be your friend, okay?\p" .string "Then we can trade POKéMON and\n" .string "do stuff.$" -Text_173A1A:: @ 8173A1A +SSAnne_1F_Room2_Text_AnnIntro:: @ 8173A1A .string "I collected these POKéMON\n" .string "from all around the world!$" -Text_173A4F:: @ 8173A4F +SSAnne_1F_Room2_Text_AnnDefeat:: @ 8173A4F .string "Oh, no!\n" .string "I went around the world for these!$" -gUnknown_8173A7A:: @ 8173A7A +SSAnne_1F_Room2_Text_AnnPostBattle:: @ 8173A7A .string "You hurt my poor POKéMON!\p" .string "I demand that you heal them at a\n" .string "POKéMON CENTER!$" -gUnknown_8173AC5:: @ 8173AC5 +SSAnne_1F_Room2_Text_CruisingAroundWorld:: @ 8173AC5 .string "We are cruising around the world,\n" .string "my children and I.$" |
