diff options
Diffstat (limited to 'data/maps/PokemonTower_4F')
| -rw-r--r-- | data/maps/PokemonTower_4F/map.json | 6 | ||||
| -rw-r--r-- | data/maps/PokemonTower_4F/scripts.inc | 18 | ||||
| -rw-r--r-- | data/maps/PokemonTower_4F/text.inc | 18 |
3 files changed, 21 insertions, 21 deletions
diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json index 73fec4fc6..4e0a22b9f 100644 --- a/data/maps/PokemonTower_4F/map.json +++ b/data/maps/PokemonTower_4F/map.json @@ -23,7 +23,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "PokemonTower_4F_EventScript_163404", + "script": "PokemonTower_4F_EventScript_Laurel", "flag": "0" }, { @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "PokemonTower_4F_EventScript_16341B", + "script": "PokemonTower_4F_EventScript_Jody", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "PokemonTower_4F_EventScript_1633ED", + "script": "PokemonTower_4F_EventScript_Paula", "flag": "0" }, { diff --git a/data/maps/PokemonTower_4F/scripts.inc b/data/maps/PokemonTower_4F/scripts.inc index 238e600e7..126cc33ef 100644 --- a/data/maps/PokemonTower_4F/scripts.inc +++ b/data/maps/PokemonTower_4F/scripts.inc @@ -1,17 +1,17 @@ PokemonTower_4F_MapScripts:: @ 81633EC .byte 0 -PokemonTower_4F_EventScript_1633ED:: @ 81633ED - trainerbattle_single TRAINER_CHANNELER_PAULA, Text_17A004, Text_17A017 - msgbox gUnknown_817A02B, MSGBOX_AUTOCLOSE +PokemonTower_4F_EventScript_Paula:: @ 81633ED + trainerbattle_single TRAINER_CHANNELER_PAULA, PokemonTower_4F_Text_PaulaIntro, PokemonTower_4F_Text_PaulaDefeat + msgbox PokemonTower_4F_Text_PaulaPostBattle, MSGBOX_AUTOCLOSE end -PokemonTower_4F_EventScript_163404:: @ 8163404 - trainerbattle_single TRAINER_CHANNELER_LAUREL, Text_17A046, Text_17A061 - msgbox gUnknown_817A067, MSGBOX_AUTOCLOSE +PokemonTower_4F_EventScript_Laurel:: @ 8163404 + trainerbattle_single TRAINER_CHANNELER_LAUREL, PokemonTower_4F_Text_LaurelIntro, PokemonTower_4F_Text_LaurelDefeat + msgbox PokemonTower_4F_Text_LaurelPostBattle, MSGBOX_AUTOCLOSE end -PokemonTower_4F_EventScript_16341B:: @ 816341B - trainerbattle_single TRAINER_CHANNELER_JODY, Text_17A096, Text_17A0AB - msgbox gUnknown_817A0BB, MSGBOX_AUTOCLOSE +PokemonTower_4F_EventScript_Jody:: @ 816341B + trainerbattle_single TRAINER_CHANNELER_JODY, PokemonTower_4F_Text_JodyIntro, PokemonTower_4F_Text_JodyDefeat + msgbox PokemonTower_4F_Text_JodyPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonTower_4F/text.inc b/data/maps/PokemonTower_4F/text.inc index 69a18a2f6..78692d6b5 100644 --- a/data/maps/PokemonTower_4F/text.inc +++ b/data/maps/PokemonTower_4F/text.inc @@ -1,33 +1,33 @@ -Text_17A004:: @ 817A004 +PokemonTower_4F_Text_PaulaIntro:: @ 817A004 .string "Ghost! No!\n" .string "Kwaaah!$" -Text_17A017:: @ 817A017 +PokemonTower_4F_Text_PaulaDefeat:: @ 817A017 .string "Where is the ghost?$" -gUnknown_817A02B:: @ 817A02B +PokemonTower_4F_Text_PaulaPostBattle:: @ 817A02B .string "I must have been dreaming…$" -Text_17A046:: @ 817A046 +PokemonTower_4F_Text_LaurelIntro:: @ 817A046 .string "Be cursed with me!\n" .string "Kwaaah!$" -Text_17A061:: @ 817A061 +PokemonTower_4F_Text_LaurelDefeat:: @ 817A061 .string "What!$" -gUnknown_817A067:: @ 817A067 +PokemonTower_4F_Text_LaurelPostBattle:: @ 817A067 .string "We can't determine the identity of\n" .string "the ghosts…$" -Text_17A096:: @ 817A096 +PokemonTower_4F_Text_JodyIntro:: @ 817A096 .string "Huhuhu…\n" .string "Beat me not!$" -Text_17A0AB:: @ 817A0AB +PokemonTower_4F_Text_JodyDefeat:: @ 817A0AB .string "Huh?\n" .string "Who? What?$" -gUnknown_817A0BB:: @ 817A0BB +PokemonTower_4F_Text_JodyPostBattle:: @ 817A0BB .string "May the departed POKéMON rest in\n" .string "peace…$" |