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_Room5 | |
| parent | c2bf9898a533a0b0cd2bba346e3df8c6f300f016 (diff) | |
Document SS Anne scripts
Diffstat (limited to 'data/maps/SSAnne_1F_Room5')
| -rw-r--r-- | data/maps/SSAnne_1F_Room5/map.json | 2 | ||||
| -rw-r--r-- | data/maps/SSAnne_1F_Room5/scripts.inc | 6 | ||||
| -rw-r--r-- | data/maps/SSAnne_1F_Room5/text.inc | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/SSAnne_1F_Room5/map.json b/data/maps/SSAnne_1F_Room5/map.json index 7d3c24e5b..6cdd3d088 100644 --- a/data/maps/SSAnne_1F_Room5/map.json +++ b/data/maps/SSAnne_1F_Room5/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "SSAnne_1F_Room5_EventScript_160C67", + "script": "SSAnne_1F_Room5_EventScript_Arthur", "flag": "0" } ], diff --git a/data/maps/SSAnne_1F_Room5/scripts.inc b/data/maps/SSAnne_1F_Room5/scripts.inc index 028442449..e91e35bf6 100644 --- a/data/maps/SSAnne_1F_Room5/scripts.inc +++ b/data/maps/SSAnne_1F_Room5/scripts.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room5_MapScripts:: @ 8160C66 .byte 0 -SSAnne_1F_Room5_EventScript_160C67:: @ 8160C67 - trainerbattle_single TRAINER_GENTLEMAN_ARTHUR, Text_173BD1, Text_173BFA - msgbox gUnknown_8173C30, MSGBOX_AUTOCLOSE +SSAnne_1F_Room5_EventScript_Arthur:: @ 8160C67 + trainerbattle_single TRAINER_GENTLEMAN_ARTHUR, SSAnne_1F_Room5_Text_ArthurIntro, SSAnne_1F_Room5_Text_ArthurDefeat + msgbox SSAnne_1F_Room5_Text_ArthurPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_1F_Room5/text.inc b/data/maps/SSAnne_1F_Room5/text.inc index 09d582707..dd2f80262 100644 --- a/data/maps/SSAnne_1F_Room5/text.inc +++ b/data/maps/SSAnne_1F_Room5/text.inc @@ -1,12 +1,12 @@ -Text_173BD1:: @ 8173BD1 +SSAnne_1F_Room5_Text_ArthurIntro:: @ 8173BD1 .string "You insolent pup!\n" .string "How dare you barge in!$" -Text_173BFA:: @ 8173BFA +SSAnne_1F_Room5_Text_ArthurDefeat:: @ 8173BFA .string "Humph! You rude child!\n" .string "You have no sense of courtesy!$" -gUnknown_8173C30:: @ 8173C30 +SSAnne_1F_Room5_Text_ArthurPostBattle:: @ 8173C30 .string "I wish to be left alone!\n" .string "Get out!$" |