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_Room4 | |
| parent | c2bf9898a533a0b0cd2bba346e3df8c6f300f016 (diff) | |
Document SS Anne scripts
Diffstat (limited to 'data/maps/SSAnne_2F_Room4')
| -rw-r--r-- | data/maps/SSAnne_2F_Room4/map.json | 4 | ||||
| -rw-r--r-- | data/maps/SSAnne_2F_Room4/scripts.inc | 12 | ||||
| -rw-r--r-- | data/maps/SSAnne_2F_Room4/text.inc | 12 |
3 files changed, 14 insertions, 14 deletions
diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json index 9b15b4707..dca8226dd 100644 --- a/data/maps/SSAnne_2F_Room4/map.json +++ b/data/maps/SSAnne_2F_Room4/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SSAnne_2F_Room4_EventScript_160CF3", + "script": "SSAnne_2F_Room4_EventScript_Lamar", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SSAnne_2F_Room4_EventScript_160D0A", + "script": "SSAnne_2F_Room4_EventScript_Dawn", "flag": "0" }, { diff --git a/data/maps/SSAnne_2F_Room4/scripts.inc b/data/maps/SSAnne_2F_Room4/scripts.inc index 85ecb21bf..13694bcfb 100644 --- a/data/maps/SSAnne_2F_Room4/scripts.inc +++ b/data/maps/SSAnne_2F_Room4/scripts.inc @@ -1,12 +1,12 @@ SSAnne_2F_Room4_MapScripts:: @ 8160CF2 .byte 0 -SSAnne_2F_Room4_EventScript_160CF3:: @ 8160CF3 - trainerbattle_single TRAINER_GENTLEMAN_LAMAR, Text_173F07, Text_173F42 - msgbox gUnknown_8173F55, MSGBOX_AUTOCLOSE +SSAnne_2F_Room4_EventScript_Lamar:: @ 8160CF3 + trainerbattle_single TRAINER_GENTLEMAN_LAMAR, SSAnne_2F_Room4_Text_LamarIntro, SSAnne_2F_Room4_Text_LamarDefeat + msgbox SSAnne_2F_Room4_Text_LamarPostBattle, MSGBOX_AUTOCLOSE end -SSAnne_2F_Room4_EventScript_160D0A:: @ 8160D0A - trainerbattle_single TRAINER_LASS_DAWN, Text_173F83, Text_173FAB - msgbox gUnknown_8173FB9, MSGBOX_AUTOCLOSE +SSAnne_2F_Room4_EventScript_Dawn:: @ 8160D0A + trainerbattle_single TRAINER_LASS_DAWN, SSAnne_2F_Room4_Text_DawnIntro, SSAnne_2F_Room4_Text_DawnDefeat + msgbox SSAnne_2F_Room4_Text_DawnPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_2F_Room4/text.inc b/data/maps/SSAnne_2F_Room4/text.inc index 69e7a7b0d..9eb19a2b4 100644 --- a/data/maps/SSAnne_2F_Room4/text.inc +++ b/data/maps/SSAnne_2F_Room4/text.inc @@ -1,22 +1,22 @@ -Text_173F07:: @ 8173F07 +SSAnne_2F_Room4_Text_LamarIntro:: @ 8173F07 .string "Which do you find more worthy,\n" .string "a strong or a rare POKéMON?$" -Text_173F42:: @ 8173F42 +SSAnne_2F_Room4_Text_LamarDefeat:: @ 8173F42 .string "I must salute you!$" -gUnknown_8173F55:: @ 8173F55 +SSAnne_2F_Room4_Text_LamarPostBattle:: @ 8173F55 .string "Personally, I prefer strong and\n" .string "rare POKéMON.$" -Text_173F83:: @ 8173F83 +SSAnne_2F_Room4_Text_DawnIntro:: @ 8173F83 .string "I don't believe I saw you at the\n" .string "party?$" -Text_173FAB:: @ 8173FAB +SSAnne_2F_Room4_Text_DawnDefeat:: @ 8173FAB .string "Take it easy!$" -gUnknown_8173FB9:: @ 8173FB9 +SSAnne_2F_Room4_Text_DawnPostBattle:: @ 8173FB9 .string "Oh, I adore your strong POKéMON!\n" .string "Oh, how I envy you for them!$" |