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_Room4 | |
| parent | c2bf9898a533a0b0cd2bba346e3df8c6f300f016 (diff) | |
Document SS Anne scripts
Diffstat (limited to 'data/maps/SSAnne_B1F_Room4')
| -rw-r--r-- | data/maps/SSAnne_B1F_Room4/map.json | 4 | ||||
| -rw-r--r-- | data/maps/SSAnne_B1F_Room4/scripts.inc | 12 | ||||
| -rw-r--r-- | data/maps/SSAnne_B1F_Room4/text.inc | 12 |
3 files changed, 14 insertions, 14 deletions
diff --git a/data/maps/SSAnne_B1F_Room4/map.json b/data/maps/SSAnne_B1F_Room4/map.json index ff6030afb..8222e4dbc 100644 --- a/data/maps/SSAnne_B1F_Room4/map.json +++ b/data/maps/SSAnne_B1F_Room4/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SSAnne_B1F_Room4_EventScript_160DBE", + "script": "SSAnne_B1F_Room4_EventScript_Duncan", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "SSAnne_B1F_Room4_EventScript_160DA7", + "script": "SSAnne_B1F_Room4_EventScript_Leonard", "flag": "0" } ], diff --git a/data/maps/SSAnne_B1F_Room4/scripts.inc b/data/maps/SSAnne_B1F_Room4/scripts.inc index c84b55b07..66b928b4c 100644 --- a/data/maps/SSAnne_B1F_Room4/scripts.inc +++ b/data/maps/SSAnne_B1F_Room4/scripts.inc @@ -1,12 +1,12 @@ SSAnne_B1F_Room4_MapScripts:: @ 8160DA6 .byte 0 -SSAnne_B1F_Room4_EventScript_160DA7:: @ 8160DA7 - trainerbattle_single TRAINER_SAILOR_LEONARD, Text_174315, Text_174348 - msgbox gUnknown_8174362, MSGBOX_AUTOCLOSE +SSAnne_B1F_Room4_EventScript_Leonard:: @ 8160DA7 + trainerbattle_single TRAINER_SAILOR_LEONARD, SSAnne_B1F_Room4_Text_LeonardIntro, SSAnne_B1F_Room4_Text_LeonardDefeat + msgbox SSAnne_B1F_Room4_Text_LeonardPostBattle, MSGBOX_AUTOCLOSE end -SSAnne_B1F_Room4_EventScript_160DBE:: @ 8160DBE - trainerbattle_single TRAINER_SAILOR_DUNCAN, Text_174385, Text_1743B3 - msgbox gUnknown_81743C8, MSGBOX_AUTOCLOSE +SSAnne_B1F_Room4_EventScript_Duncan:: @ 8160DBE + trainerbattle_single TRAINER_SAILOR_DUNCAN, SSAnne_B1F_Room4_Text_DuncanIntro, SSAnne_B1F_Room4_Text_DuncanDefeat + msgbox SSAnne_B1F_Room4_Text_DuncanPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_B1F_Room4/text.inc b/data/maps/SSAnne_B1F_Room4/text.inc index d2f19f49f..fa6d7eb2e 100644 --- a/data/maps/SSAnne_B1F_Room4/text.inc +++ b/data/maps/SSAnne_B1F_Room4/text.inc @@ -1,23 +1,23 @@ -Text_174315:: @ 8174315 +SSAnne_B1F_Room4_Text_LeonardIntro:: @ 8174315 .string "You know what they say about\n" .string "sailors and battling!$" -Text_174348:: @ 8174348 +SSAnne_B1F_Room4_Text_LeonardDefeat:: @ 8174348 .string "Right!\n" .string "Good battle, mate!$" -gUnknown_8174362:: @ 8174362 +SSAnne_B1F_Room4_Text_LeonardPostBattle:: @ 8174362 .string "Hahaha!\n" .string "Want to be a sailor, mate?$" -Text_174385:: @ 8174385 +SSAnne_B1F_Room4_Text_DuncanIntro:: @ 8174385 .string "Come on, then!\n" .string "My sailor's pride is at stake!$" -Text_1743B3:: @ 81743B3 +SSAnne_B1F_Room4_Text_DuncanDefeat:: @ 81743B3 .string "Your spirit sank me!$" -gUnknown_81743C8:: @ 81743C8 +SSAnne_B1F_Room4_Text_DuncanPostBattle:: @ 81743C8 .string "Did you see the FISHING GURU in\n" .string "VERMILION CITY?$" |