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_Room7 | |
| parent | c2bf9898a533a0b0cd2bba346e3df8c6f300f016 (diff) | |
Document SS Anne scripts
Diffstat (limited to 'data/maps/SSAnne_1F_Room7')
| -rw-r--r-- | data/maps/SSAnne_1F_Room7/map.json | 2 | ||||
| -rw-r--r-- | data/maps/SSAnne_1F_Room7/scripts.inc | 6 | ||||
| -rw-r--r-- | data/maps/SSAnne_1F_Room7/text.inc | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/SSAnne_1F_Room7/map.json b/data/maps/SSAnne_1F_Room7/map.json index 887022650..98496a947 100644 --- a/data/maps/SSAnne_1F_Room7/map.json +++ b/data/maps/SSAnne_1F_Room7/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "SSAnne_1F_Room7_EventScript_160C7F", + "script": "SSAnne_1F_Room7_EventScript_Thomas", "flag": "0" } ], diff --git a/data/maps/SSAnne_1F_Room7/scripts.inc b/data/maps/SSAnne_1F_Room7/scripts.inc index 5901ee65b..60e26dc73 100644 --- a/data/maps/SSAnne_1F_Room7/scripts.inc +++ b/data/maps/SSAnne_1F_Room7/scripts.inc @@ -1,7 +1,7 @@ SSAnne_1F_Room7_MapScripts:: @ 8160C7E .byte 0 -SSAnne_1F_Room7_EventScript_160C7F:: @ 8160C7F - trainerbattle_single TRAINER_GENTLEMAN_THOMAS, Text_173C52, Text_173CB4 - msgbox gUnknown_8173CC4, MSGBOX_AUTOCLOSE +SSAnne_1F_Room7_EventScript_Thomas:: @ 8160C7F + trainerbattle_single TRAINER_GENTLEMAN_THOMAS, SSAnne_1F_Room7_Text_ThomasIntro, SSAnne_1F_Room7_Text_ThomasDefeat + msgbox SSAnne_1F_Room7_Text_ThomasPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_1F_Room7/text.inc b/data/maps/SSAnne_1F_Room7/text.inc index d4fed83fb..3a8ce2f28 100644 --- a/data/maps/SSAnne_1F_Room7/text.inc +++ b/data/maps/SSAnne_1F_Room7/text.inc @@ -1,11 +1,11 @@ -Text_173C52:: @ 8173C52 +SSAnne_1F_Room7_Text_ThomasIntro:: @ 8173C52 .string "I am but a solitary traveler…\p" .string "My sole companions and friends are\n" .string "POKéMON I caught on my journeys…$" -Text_173CB4:: @ 8173CB4 +SSAnne_1F_Room7_Text_ThomasDefeat:: @ 8173CB4 .string "My, my friends…$" -gUnknown_8173CC4:: @ 8173CC4 +SSAnne_1F_Room7_Text_ThomasPostBattle:: @ 8173CC4 .string "You should be nice to friends!$" |