diff options
Diffstat (limited to 'data')
43 files changed, 439 insertions, 426 deletions
diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json index cf40eae9e..f91680715 100644 --- a/data/maps/FiveIsland/map.json +++ b/data/maps/FiveIsland/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_EventScript_167EAA", + "script": "FiveIsland_EventScript_Fisher", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_EventScript_167EA1", + "script": "FiveIsland_EventScript_BugCatcher", "flag": "0" }, { @@ -104,7 +104,7 @@ "x": 20, "y": 8, "elevation": 0, - "script": "FiveIsland_EventScript_167E98" + "script": "FiveIsland_EventScript_IslandSign" } ] } diff --git a/data/maps/FiveIsland/scripts.inc b/data/maps/FiveIsland/scripts.inc index 6b925d8f9..ca47c7db4 100644 --- a/data/maps/FiveIsland/scripts.inc +++ b/data/maps/FiveIsland/scripts.inc @@ -6,14 +6,14 @@ FiveIsland_OnTransition:: @ 8167E94 setworldmapflag FLAG_WORLD_MAP_FIVE_ISLAND end -FiveIsland_EventScript_167E98:: @ 8167E98 - msgbox gUnknown_8182DFB, MSGBOX_SIGN +FiveIsland_EventScript_IslandSign:: @ 8167E98 + msgbox FiveIsland_Text_IslandSign, MSGBOX_SIGN end -FiveIsland_EventScript_167EA1:: @ 8167EA1 - msgbox gUnknown_8182E26, MSGBOX_NPC +FiveIsland_EventScript_BugCatcher:: @ 8167EA1 + msgbox FiveIsland_Text_WeirdBuildingInMeadow, MSGBOX_NPC end -FiveIsland_EventScript_167EAA:: @ 8167EAA - msgbox gUnknown_8182E96, MSGBOX_NPC +FiveIsland_EventScript_Fisher:: @ 8167EAA + msgbox FiveIsland_Text_BeenGettingBusierAroundHere, MSGBOX_NPC end diff --git a/data/maps/FiveIsland/text.inc b/data/maps/FiveIsland/text.inc index 40c0d7b4e..045f8c09f 100644 --- a/data/maps/FiveIsland/text.inc +++ b/data/maps/FiveIsland/text.inc @@ -1,14 +1,14 @@ -gUnknown_8182DFB:: @ 8182DFB +FiveIsland_Text_IslandSign:: @ 8182DFB .string "FIVE ISLAND\n" .string "Chrono Island: Where Time Goes$" -gUnknown_8182E26:: @ 8182E26 +FiveIsland_Text_WeirdBuildingInMeadow:: @ 8182E26 .string "Oh, this stinks. I wanted to play in\n" .string "the MEADOW.\p" .string "But they put up a weird building\n" .string "on it, so I can't play there.$" -gUnknown_8182E96:: @ 8182E96 +FiveIsland_Text_BeenGettingBusierAroundHere:: @ 8182E96 .string "It's been getting busier around\n" .string "these parts lately.\p" .string "I haven't been catching many good\n" diff --git a/data/maps/FiveIsland_Harbor/map.json b/data/maps/FiveIsland_Harbor/map.json index 4cbf533e1..3dbe4effc 100644 --- a/data/maps/FiveIsland_Harbor/map.json +++ b/data/maps/FiveIsland_Harbor/map.json @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_Harbor_EventScript_171D43", + "script": "FiveIsland_Harbor_EventScript_Sailor", "flag": "0" } ], diff --git a/data/maps/FiveIsland_Harbor/scripts.inc b/data/maps/FiveIsland_Harbor/scripts.inc index 47ee3487f..6cb97fd8e 100644 --- a/data/maps/FiveIsland_Harbor/scripts.inc +++ b/data/maps/FiveIsland_Harbor/scripts.inc @@ -1,7 +1,7 @@ FiveIsland_Harbor_MapScripts:: @ 8171D42 .byte 0 -FiveIsland_Harbor_EventScript_171D43:: @ 8171D43 +FiveIsland_Harbor_EventScript_Sailor:: @ 8171D43 lock faceplayer message Text_WhereDoYouWantToSail diff --git a/data/maps/FiveIsland_House1/map.json b/data/maps/FiveIsland_House1/map.json index d75fa598d..e6f0c29c5 100644 --- a/data/maps/FiveIsland_House1/map.json +++ b/data/maps/FiveIsland_House1/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_House1_EventScript_171D57", + "script": "FiveIsland_House1_EventScript_Woman", "flag": "0" } ], diff --git a/data/maps/FiveIsland_House1/scripts.inc b/data/maps/FiveIsland_House1/scripts.inc index 86f6cbcb4..b3ea78ecb 100644 --- a/data/maps/FiveIsland_House1/scripts.inc +++ b/data/maps/FiveIsland_House1/scripts.inc @@ -1,6 +1,6 @@ FiveIsland_House1_MapScripts:: @ 8171D56 .byte 0 -FiveIsland_House1_EventScript_171D57:: @ 8171D57 - msgbox gUnknown_81A3CAC, MSGBOX_NPC +FiveIsland_House1_EventScript_Woman:: @ 8171D57 + msgbox FiveIsland_House1_Text_HusbandWentOffFishing, MSGBOX_NPC end diff --git a/data/maps/FiveIsland_House1/text.inc b/data/maps/FiveIsland_House1/text.inc index 7fa7e5ac1..1724cf678 100644 --- a/data/maps/FiveIsland_House1/text.inc +++ b/data/maps/FiveIsland_House1/text.inc @@ -1,11 +1,11 @@ -Text_1A3C71:: @ 81A3C71 +FiveIsland_House1_JPText_HusbandWentOffFishing:: @ 81A3C71 .string "こんばんの おかずは\n" .string "ようい しなくて いいぞ！\p" .string "って だんなが\n" .string "つりに いったん だけど‥\l" .string "しんじて いいのかねえ$" -gUnknown_81A3CAC:: @ 81A3CAC +FiveIsland_House1_Text_HusbandWentOffFishing:: @ 81A3CAC .string "Don't worry about buying anything\n" .string "for dinner tonight!\p" .string "…That's what my husband said when\n" diff --git a/data/maps/FiveIsland_House2/map.json b/data/maps/FiveIsland_House2/map.json index 2a3c96e0c..b1e15c7e9 100644 --- a/data/maps/FiveIsland_House2/map.json +++ b/data/maps/FiveIsland_House2/map.json @@ -25,7 +25,7 @@ "movement_range_y": 2, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_House2_EventScript_171D61", + "script": "FiveIsland_House2_EventScript_OldMan", "flag": "0" } ], diff --git a/data/maps/FiveIsland_House2/scripts.inc b/data/maps/FiveIsland_House2/scripts.inc index 79cfa755f..938571eb0 100644 --- a/data/maps/FiveIsland_House2/scripts.inc +++ b/data/maps/FiveIsland_House2/scripts.inc @@ -1,6 +1,6 @@ FiveIsland_House2_MapScripts:: @ 8171D60 .byte 0 -FiveIsland_House2_EventScript_171D61:: @ 8171D61 - msgbox gUnknown_81A3D5E, MSGBOX_NPC +FiveIsland_House2_EventScript_OldMan:: @ 8171D61 + msgbox FiveIsland_House2_Text_MeadowBelongedToFamily, MSGBOX_NPC end diff --git a/data/maps/FiveIsland_House2/text.inc b/data/maps/FiveIsland_House2/text.inc index bad18b3a3..dd794b4e3 100644 --- a/data/maps/FiveIsland_House2/text.inc +++ b/data/maps/FiveIsland_House2/text.inc @@ -1,4 +1,4 @@ -gUnknown_81A3D5E:: @ 81A3D5E +FiveIsland_House2_Text_MeadowBelongedToFamily:: @ 81A3D5E .string "That MEADOW has belonged to our\n" .string "family for generations.\p" .string "I should have had a giant mansion\n" diff --git a/data/maps/FiveIsland_LostCave_Room1/map.json b/data/maps/FiveIsland_LostCave_Room1/map.json index 43b8fe08c..ab4b2a727 100644 --- a/data/maps/FiveIsland_LostCave_Room1/map.json +++ b/data/maps/FiveIsland_LostCave_Room1/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "FiveIsland_LostCave_Room1_EventScript_164BF7", + "script": "FiveIsland_LostCave_Room1_EventScript_Lawson", "flag": "0" } ], diff --git a/data/maps/FiveIsland_LostCave_Room1/scripts.inc b/data/maps/FiveIsland_LostCave_Room1/scripts.inc index b6f4e0257..07e1df046 100644 --- a/data/maps/FiveIsland_LostCave_Room1/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room1/scripts.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room1_MapScripts:: @ 8164BF6 .byte 0 -FiveIsland_LostCave_Room1_EventScript_164BF7:: @ 8164BF7 - trainerbattle_single TRAINER_RUIN_MANIAC_LAWSON, Text_17CEF5, Text_17CF42 - msgbox gUnknown_817CF54, MSGBOX_AUTOCLOSE +FiveIsland_LostCave_Room1_EventScript_Lawson:: @ 8164BF7 + trainerbattle_single TRAINER_RUIN_MANIAC_LAWSON, FiveIsland_LostCave_Room1_Text_LawsonIntro, FiveIsland_LostCave_Room1_Text_LawsonDefeat + msgbox FiveIsland_LostCave_Room1_Text_LawsonPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/FiveIsland_LostCave_Room1/text.inc b/data/maps/FiveIsland_LostCave_Room1/text.inc index 820a9a10f..d57eb39cf 100644 --- a/data/maps/FiveIsland_LostCave_Room1/text.inc +++ b/data/maps/FiveIsland_LostCave_Room1/text.inc @@ -1,13 +1,13 @@ -Text_17CEF5:: @ 817CEF5 +FiveIsland_LostCave_Room1_Text_LawsonIntro:: @ 817CEF5 .string "Aiyeeeeeh!\p" .string "I thought this was an ancient ruin.\n" .string "But it's teeming with ghosts!$" -Text_17CF42:: @ 817CF42 +FiveIsland_LostCave_Room1_Text_LawsonDefeat:: @ 817CF42 .string "Aiyeeeeeh!\n" .string "Mercy!$" -gUnknown_817CF54:: @ 817CF54 +FiveIsland_LostCave_Room1_Text_LawsonPostBattle:: @ 817CF54 .string "I'm trying to get out of here, but\n" .string "I always end up at the same spot.\p" .string "Maybe the number of boulders is\n" diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index 8610c7c2d..747823b0d 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -4,50 +4,50 @@ FiveIsland_LostCave_Room10_MapScripts:: @ 8164C2D .byte 0 FiveIsland_LostCave_Room10_OnResume:: @ 8164C38 - call_if_defeated TRAINER_LADY_SELPHY, EventScript_164C42 + call_if_defeated TRAINER_LADY_SELPHY, FiveIsland_LostCave_Room10_EventScript_StopSelphySceneTrigger end -EventScript_164C42:: @ 8164C42 +FiveIsland_LostCave_Room10_EventScript_StopSelphySceneTrigger:: @ 8164C42 setvar VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 1 return FiveIsland_LostCave_Room10_OnFrame:: @ 8164C48 - map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 0, EventScript_164C52 + map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 0, FiveIsland_LostCave_Room10_EventScript_FindSelphyScene .2byte 0 -EventScript_164C52:: @ 8164C52 +FiveIsland_LostCave_Room10_EventScript_FindSelphyScene:: @ 8164C52 lockall textcolor 1 - applymovement 1, Movement_164CC0 + applymovement 1, FiveIsland_LostCave_Room10_Movement_SelphyWander waitmovement 0 delay 100 - applymovement 1, Movement_164CC8 + applymovement 1, FiveIsland_LostCave_Room10_Movement_SelphyApproach waitmovement 0 - msgbox gUnknown_817D062 - goto_if_questlog EventScript_164CB6 - trainerbattle_no_intro TRAINER_LADY_SELPHY, Text_17D086 - msgbox gUnknown_817D0B2 + msgbox FiveIsland_LostCave_Room10_Text_SelphyIntro + goto_if_questlog FiveIsland_LostCave_Room10_EventScript_SelphyQuestLog + trainerbattle_no_intro TRAINER_LADY_SELPHY, FiveIsland_LostCave_Room10_Text_SelphyDefeat + msgbox FiveIsland_LostCave_Room10_Text_MayIAskYouToTakeMeHome closemessage - call EventScript_164CA5 + call FiveIsland_LostCave_Room10_EventScript_SetSelphyFound warp MAP_FIVE_ISLAND_RESORT_GORGEOUS, 255, 39, 10 waitstate releaseall end -EventScript_164CA5:: @ 8164CA5 +FiveIsland_LostCave_Room10_EventScript_SetSelphyFound:: @ 8164CA5 setflag FLAG_HIDE_LOST_CAVE_SELPHY clearflag FLAG_HIDE_RESORT_GORGEOUS_SELPHY setvar VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 1 setvar VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1 return -EventScript_164CB6:: @ 8164CB6 +FiveIsland_LostCave_Room10_EventScript_SelphyQuestLog:: @ 8164CB6 settrainerflag TRAINER_LADY_SELPHY - call EventScript_164CA5 + call FiveIsland_LostCave_Room10_EventScript_SetSelphyFound releaseall end -Movement_164CC0:: @ 8164CC0 +FiveIsland_LostCave_Room10_Movement_SelphyWander:: @ 8164CC0 walk_left delay_16 walk_right @@ -57,7 +57,7 @@ Movement_164CC0:: @ 8164CC0 walk_in_place_fastest_down step_end -Movement_164CC8:: @ 8164CC8 +FiveIsland_LostCave_Room10_Movement_SelphyApproach:: @ 8164CC8 walk_down walk_down step_end diff --git a/data/maps/FiveIsland_LostCave_Room10/text.inc b/data/maps/FiveIsland_LostCave_Room10/text.inc index da92ae5e7..57542fe1f 100644 --- a/data/maps/FiveIsland_LostCave_Room10/text.inc +++ b/data/maps/FiveIsland_LostCave_Room10/text.inc @@ -1,12 +1,12 @@ -gUnknown_817D062:: @ 817D062 +FiveIsland_LostCave_Room10_Text_SelphyIntro:: @ 817D062 .string "W-what do you intend to do with\n" .string "me?$" -Text_17D086:: @ 817D086 +FiveIsland_LostCave_Room10_Text_SelphyDefeat:: @ 817D086 .string "Oh… I was afraid that you meant to\n" .string "harm me.$" -gUnknown_817D0B2:: @ 817D0B2 +FiveIsland_LostCave_Room10_Text_MayIAskYouToTakeMeHome:: @ 817D0B2 .string "I am so glad that you happened\n" .string "here.\p" .string "I grew rather bored of walking,\n" diff --git a/data/maps/FiveIsland_LostCave_Room4/map.json b/data/maps/FiveIsland_LostCave_Room4/map.json index 844d47ac4..059093f62 100644 --- a/data/maps/FiveIsland_LostCave_Room4/map.json +++ b/data/maps/FiveIsland_LostCave_Room4/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "FiveIsland_LostCave_Room4_EventScript_164C11", + "script": "FiveIsland_LostCave_Room4_EventScript_Laura", "flag": "0" } ], diff --git a/data/maps/FiveIsland_LostCave_Room4/scripts.inc b/data/maps/FiveIsland_LostCave_Room4/scripts.inc index 38241ab71..936e488e8 100644 --- a/data/maps/FiveIsland_LostCave_Room4/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room4/scripts.inc @@ -1,7 +1,7 @@ FiveIsland_LostCave_Room4_MapScripts:: @ 8164C10 .byte 0 -FiveIsland_LostCave_Room4_EventScript_164C11:: @ 8164C11 - trainerbattle_single TRAINER_PSYCHIC_LAURA, Text_17CFC1, Text_17CFFB - msgbox gUnknown_817D037, MSGBOX_AUTOCLOSE +FiveIsland_LostCave_Room4_EventScript_Laura:: @ 8164C11 + trainerbattle_single TRAINER_PSYCHIC_LAURA, FiveIsland_LostCave_Room4_Text_LauraIntro, FiveIsland_LostCave_Room4_Text_LauraDefeat + msgbox FiveIsland_LostCave_Room4_Text_LauraPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/FiveIsland_LostCave_Room4/text.inc b/data/maps/FiveIsland_LostCave_Room4/text.inc index a9a8c0daf..7244fcccb 100644 --- a/data/maps/FiveIsland_LostCave_Room4/text.inc +++ b/data/maps/FiveIsland_LostCave_Room4/text.inc @@ -1,12 +1,12 @@ -Text_17CFC1:: @ 817CFC1 +FiveIsland_LostCave_Room4_Text_LauraIntro:: @ 817CFC1 .string "I think there is a mysterious power\n" .string "at work in this cave.$" -Text_17CFFB:: @ 817CFFB +FiveIsland_LostCave_Room4_Text_LauraDefeat:: @ 817CFFB .string "If you don't go into the right\n" .string "tunnel, you won't get ahead.$" -gUnknown_817D037:: @ 817D037 +FiveIsland_LostCave_Room4_Text_LauraPostBattle:: @ 817D037 .string "Earlier, a lady went into the caves\n" .string "ahead.$" diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index 6546c6e5a..6c1caf054 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "FiveIsland_Meadow_EventScript_1689BB", + "script": "FiveIsland_Meadow_EventScript_Rocket3", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "FiveIsland_Meadow_EventScript_16898D", + "script": "FiveIsland_Meadow_EventScript_Rocket1", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "FiveIsland_Meadow_EventScript_1689A4", + "script": "FiveIsland_Meadow_EventScript_Rocket2", "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { @@ -134,7 +134,7 @@ "x": 12, "y": 21, "elevation": 0, - "script": "FiveIsland_Meadow_EventScript_168942" + "script": "FiveIsland_Meadow_EventScript_WarehouseDoor" } ] } diff --git a/data/maps/FiveIsland_Meadow/scripts.inc b/data/maps/FiveIsland_Meadow/scripts.inc index 21fd9be76..e0e94022f 100644 --- a/data/maps/FiveIsland_Meadow/scripts.inc +++ b/data/maps/FiveIsland_Meadow/scripts.inc @@ -3,49 +3,49 @@ FiveIsland_Meadow_MapScripts:: @ 8168932 .byte 0 FiveIsland_Meadow_OnLoad:: @ 8168938 - call_if_set FLAG_UNLOCKED_ROCKET_WAREHOUSE, EventScript_168983 + call_if_set FLAG_UNLOCKED_ROCKET_WAREHOUSE, FiveIsland_Meadow_EventScript_SetWarehouseDoorUnlocked end -FiveIsland_Meadow_EventScript_168942:: @ 8168942 +FiveIsland_Meadow_EventScript_WarehouseDoor:: @ 8168942 lockall - goto_if_set FLAG_UNLOCKED_ROCKET_WAREHOUSE, EventScript_168979 - goto_if_set FLAG_LEARNED_YES_NAH_CHANSEY, EventScript_16895F - msgbox gUnknown_818AB8E + goto_if_set FLAG_UNLOCKED_ROCKET_WAREHOUSE, FiveIsland_Meadow_EventScript_WarehouseDoorAlreadyOpen + goto_if_set FLAG_LEARNED_YES_NAH_CHANSEY, FiveIsland_Meadow_EventScript_OpenWarehouseDoor + msgbox FiveIsland_Meadow_Text_EnteredPasswordAnotherNeeded releaseall end -EventScript_16895F:: @ 816895F +FiveIsland_Meadow_EventScript_OpenWarehouseDoor:: @ 816895F setflag FLAG_UNLOCKED_ROCKET_WAREHOUSE - message Text_18ABF4 + message FiveIsland_Meadow_Text_EnteredPasswordDoorOpened waitmessage delay 60 - call EventScript_168983 + call FiveIsland_Meadow_EventScript_SetWarehouseDoorUnlocked special DrawWholeMapView playse SE_PIN waitse releaseall end -EventScript_168979:: @ 8168979 - msgbox gUnknown_818AC62 +FiveIsland_Meadow_EventScript_WarehouseDoorAlreadyOpen:: @ 8168979 + msgbox FiveIsland_Meadow_Text_WarehouseDoorAlreadyOpen releaseall end -EventScript_168983:: @ 8168983 - setmetatile 12, 21, 687, 1 +FiveIsland_Meadow_EventScript_SetWarehouseDoorUnlocked:: @ 8168983 + setmetatile 12, 21, METATILE_SeviiIslands45_RocketWarehouseDoor_Unlocked, 1 return -FiveIsland_Meadow_EventScript_16898D:: @ 816898D - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_49, Text_18AC88, Text_18ACB3 - msgbox gUnknown_818ACC5, MSGBOX_AUTOCLOSE +FiveIsland_Meadow_EventScript_Rocket1:: @ 816898D + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_49, FiveIsland_Meadow_Text_Rocket1Intro, FiveIsland_Meadow_Text_Rocket1Defeat + msgbox FiveIsland_Meadow_Text_Rocket1PostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_Meadow_EventScript_1689A4:: @ 81689A4 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_50, Text_18ACF0, Text_18AD39 - msgbox gUnknown_818AD59, MSGBOX_AUTOCLOSE +FiveIsland_Meadow_EventScript_Rocket2:: @ 81689A4 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_50, FiveIsland_Meadow_Text_Rocket2Intro, FiveIsland_Meadow_Text_Rocket2Defeat + msgbox FiveIsland_Meadow_Text_Rocket2PostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_Meadow_EventScript_1689BB:: @ 81689BB - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_51, Text_18ADC6, Text_18ADFB - msgbox gUnknown_818AE16, MSGBOX_AUTOCLOSE +FiveIsland_Meadow_EventScript_Rocket3:: @ 81689BB + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_51, FiveIsland_Meadow_Text_Rocket3Intro, FiveIsland_Meadow_Text_Rocket3Defeat + msgbox FiveIsland_Meadow_Text_Rocket3PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/FiveIsland_Meadow/text.inc b/data/maps/FiveIsland_Meadow/text.inc index 7ffd69619..7d1ef844c 100644 --- a/data/maps/FiveIsland_Meadow/text.inc +++ b/data/maps/FiveIsland_Meadow/text.inc @@ -1,70 +1,59 @@ -Text_18AAD5:: @ 818AAD5 - .string "This is an excellent environment\n" - .string "for raising POKéMON.$" - -Text_18AB0B:: @ 818AB0B - .string "Your POKéMON are growing up\n" - .string "admirably well!$" - -Text_18AB37:: @ 818AB37 - .string "You know, I think you have the\n" - .string "talent to be a good BREEDER.$" - -Text_18AB73:: @ 818AB73 +@ Unused +FiveIsland_Meadow_Text_DoorNeedsTwoPasswords:: @ 818AB73 .string "とびらを あけるには\n" .string "パスワードが 2つ いるようだ$" -gUnknown_818AB8E:: @ 818AB8E +FiveIsland_Meadow_Text_EnteredPasswordAnotherNeeded:: @ 818AB8E .string "{PLAYER} entered a password.\p" .string "“GOLDEEN need log.”\p" .string "… … … … … …\p" .string "Another password is needed to\n" .string "open the door…$" -Text_18ABF4:: @ 818ABF4 +FiveIsland_Meadow_Text_EnteredPasswordDoorOpened:: @ 818ABF4 .string "{PLAYER} entered two passwords.\p" .string "“GOLDEEN need log.”\n" .string "“Yes, nah, CHANSEY.”\p" .string "… … … … … …\p" .string "The WAREHOUSE's door opened!$" -gUnknown_818AC62:: @ 818AC62 +FiveIsland_Meadow_Text_WarehouseDoorAlreadyOpen:: @ 818AC62 .string "The WAREHOUSE's door is already\n" .string "open.$" -Text_18AC88:: @ 818AC88 +FiveIsland_Meadow_Text_Rocket1Intro:: @ 818AC88 .string "This area's strictly off-limits!\n" .string "Out, out!$" -Text_18ACB3:: @ 818ACB3 +FiveIsland_Meadow_Text_Rocket1Defeat:: @ 818ACB3 .string "Is this for real?$" -gUnknown_818ACC5:: @ 818ACC5 +FiveIsland_Meadow_Text_Rocket1PostBattle:: @ 818ACC5 .string "You don't have any business here!\n" .string "Go home!$" -Text_18ACF0:: @ 818ACF0 +FiveIsland_Meadow_Text_Rocket2Intro:: @ 818ACF0 .string "There's nothing past here except\n" .string "our WAREHOUSE.\p" .string "So what brings you here?$" -Text_18AD39:: @ 818AD39 +FiveIsland_Meadow_Text_Rocket2Defeat:: @ 818AD39 .string "That wasn't supposed to happen…$" -gUnknown_818AD59:: @ 818AD59 +FiveIsland_Meadow_Text_Rocket2PostBattle:: @ 818AD59 .string "You're wanting to know what's inside\n" .string "this WAREHOUSE?\p" .string "It's better you didn't know.\n" .string "For your own sake, I mean.$" -Text_18ADC6:: @ 818ADC6 +FiveIsland_Meadow_Text_Rocket3Intro:: @ 818ADC6 .string "You'd be wasting time even if you\n" .string "were to get by me.$" -Text_18ADFB:: @ 818ADFB +FiveIsland_Meadow_Text_Rocket3Defeat:: @ 818ADFB .string "Oh, that makes me furious!$" -gUnknown_818AE16:: @ 818AE16 +FiveIsland_Meadow_Text_Rocket3PostBattle:: @ 818AE16 .string "You won't be able to get in without\n" .string "the passwords anyway.$" diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json index 34edad014..11719d89b 100644 --- a/data/maps/FiveIsland_MemorialPillar/map.json +++ b/data/maps/FiveIsland_MemorialPillar/map.json @@ -31,7 +31,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_MemorialPillar_EventScript_1689D3", + "script": "FiveIsland_MemorialPillar_EventScript_MemorialMan", "flag": "0" }, { @@ -44,7 +44,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "FiveIsland_MemorialPillar_EventScript_1AC317", + "script": "FiveIsland_MemorialPillar_EventScript_Milo", "flag": "0" }, { @@ -57,7 +57,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "FiveIsland_MemorialPillar_EventScript_1AC355", + "script": "FiveIsland_MemorialPillar_EventScript_Chaz", "flag": "0" }, { @@ -70,7 +70,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "FiveIsland_MemorialPillar_EventScript_1AC393", + "script": "FiveIsland_MemorialPillar_EventScript_Harold", "flag": "0" }, { @@ -95,7 +95,7 @@ "x": 9, "y": 43, "elevation": 0, - "script": "FiveIsland_MemorialPillar_EventScript_168A48" + "script": "FiveIsland_MemorialPillar_EventScript_Memorial" }, { "type": "hidden_item", diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc index 98de6167e..7fd2a810d 100644 --- a/data/maps/FiveIsland_MemorialPillar/scripts.inc +++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc @@ -1,59 +1,59 @@ FiveIsland_MemorialPillar_MapScripts:: @ 81689D2 .byte 0 -FiveIsland_MemorialPillar_EventScript_1689D3:: @ 81689D3 +FiveIsland_MemorialPillar_EventScript_MemorialMan:: @ 81689D3 lock - goto_if_set FLAG_GOT_TM42_AT_MEMORIAL_PILLAR, EventScript_168A18 - goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, EventScript_168A22 - msgbox gUnknown_818B02E + goto_if_set FLAG_GOT_TM42_AT_MEMORIAL_PILLAR, FiveIsland_MemorialPillar_EventScript_AlreadyGotTM42 + goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, FiveIsland_MemorialPillar_EventScript_ReturnedForTM42 + msgbox FiveIsland_MemorialPillar_Text_ScrubScrub closemessage applymovement 1, Movement_FacePlayer waitmovement 0 delay 45 - msgbox gUnknown_818B03C + msgbox FiveIsland_MemorialPillar_Text_YourMonsLookHealthy applymovement 1, Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox gUnknown_818B05E + msgbox FiveIsland_MemorialPillar_Text_ThisIsWhereIBuriedMyOnix release end -EventScript_168A18:: @ 8168A18 - msgbox gUnknown_818B2DA +FiveIsland_MemorialPillar_EventScript_AlreadyGotTM42:: @ 8168A18 + msgbox FiveIsland_MemorialPillar_Text_ScrubScrubTectonix release end -EventScript_168A22:: @ 8168A22 - msgbox gUnknown_818B282 +FiveIsland_MemorialPillar_EventScript_ReturnedForTM42:: @ 8168A22 + msgbox FiveIsland_MemorialPillar_Text_StillHaveThingAsMyThanks giveitem ITEM_TM42 - compare VAR_RESULT, 0 - goto_if_eq EventScript_168AFE - call EventScript_168AE8 + compare VAR_RESULT, FALSE + goto_if_eq FiveIsland_MemorialPillar_EventScript_NoRoomForTM42 + call FiveIsland_MemorialPillar_EventScript_ReceivedTM42 release end -FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48 +FiveIsland_MemorialPillar_EventScript_Memorial:: @ 8168A48 goto_if_questlog EventScript_ReleaseEnd special sub_8112364 lockall - goto_if_set FLAG_GOT_TM42_AT_MEMORIAL_PILLAR, EventScript_168B0B - goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, EventScript_168B0B - msgbox gUnknown_818B095 + goto_if_set FLAG_GOT_TM42_AT_MEMORIAL_PILLAR, FiveIsland_MemorialPillar_EventScript_MemorialLemonadeAlreadyPlaced + goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, FiveIsland_MemorialPillar_EventScript_MemorialLemonadeAlreadyPlaced + msgbox FiveIsland_MemorialPillar_Text_HereLiesTectonixLemonadeOffering checkitem ITEM_LEMONADE, 1 compare VAR_RESULT, TRUE - goto_if_eq EventScript_168A86 + goto_if_eq FiveIsland_MemorialPillar_EventScript_AskPlaceLemonade releaseall end -EventScript_168A86:: @ 8168A86 - msgbox gUnknown_818B105, MSGBOX_YESNO +FiveIsland_MemorialPillar_EventScript_AskPlaceLemonade:: @ 8168A86 + msgbox FiveIsland_MemorialPillar_Text_LeaveAnotherLemonadeOffering, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq EventScript_168A9B + goto_if_eq FiveIsland_MemorialPillar_EventScript_PlaceLemonade releaseall end -EventScript_168A9B:: @ 8168A9B +FiveIsland_MemorialPillar_EventScript_PlaceLemonade:: @ 8168A9B removeitem ITEM_LEMONADE, 1 - msgbox gUnknown_818B13E + msgbox FiveIsland_MemorialPillar_Text_PlacedCanOfLemonade closemessage applymovement 1, Movement_WalkInPlaceFastestRight waitmovement 0 @@ -61,28 +61,28 @@ EventScript_168A9B:: @ 8168A9B applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 textcolor 0 - msgbox gUnknown_818B171 + msgbox FiveIsland_MemorialPillar_Text_ThankYouPleaseTakeThis giveitem ITEM_TM42 - compare VAR_RESULT, 0 - goto_if_eq EventScript_168AFE - call EventScript_168AE8 + compare VAR_RESULT, FALSE + goto_if_eq FiveIsland_MemorialPillar_EventScript_NoRoomForTM42 + call FiveIsland_MemorialPillar_EventScript_ReceivedTM42 releaseall end -EventScript_168AE8:: @ 8168AE8 - msgbox gUnknown_818B219 +FiveIsland_MemorialPillar_EventScript_ReceivedTM42:: @ 8168AE8 + msgbox FiveIsland_MemorialPillar_Text_BeGoodToYourMonsToo applymovement 1, Movement_WalkInPlaceFastestUp waitmovement 0 setflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR return -EventScript_168AFE:: @ 8168AFE +FiveIsland_MemorialPillar_EventScript_NoRoomForTM42:: @ 8168AFE setflag FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR - msgbox gUnknown_818B23E + msgbox FiveIsland_MemorialPillar_Text_DontHaveRoomForIt releaseall end -EventScript_168B0B:: @ 8168B0B - msgbox gUnknown_818B2F8 +FiveIsland_MemorialPillar_EventScript_MemorialLemonadeAlreadyPlaced:: @ 8168B0B + msgbox FiveIsland_MemorialPillar_Text_HereLiesTectonix releaseall end diff --git a/data/maps/FiveIsland_MemorialPillar/text.inc b/data/maps/FiveIsland_MemorialPillar/text.inc index 051f3fdc1..9ba8625e5 100644 --- a/data/maps/FiveIsland_MemorialPillar/text.inc +++ b/data/maps/FiveIsland_MemorialPillar/text.inc @@ -1,69 +1,69 @@ -Text_18AE50:: @ 818AE50 +FiveIsland_MemorialPillar_Text_MiloIntro:: @ 818AE50 .string "I'm the eldest of the BIRD\n" .string "BROTHERS.\p" .string "The best thing about birds…\n" .string "It has to be the beak.$" -Text_18AEA8:: @ 818AEA8 +FiveIsland_MemorialPillar_Text_MiloDefeat:: @ 818AEA8 .string "Oh, so sharp!$" -Text_18AEB6:: @ 818AEB6 +FiveIsland_MemorialPillar_Text_MiloPostBattle:: @ 818AEB6 .string "You can fly to FOUR ISLAND from\n" .string "here.$" -Text_18AEDC:: @ 818AEDC +FiveIsland_MemorialPillar_Text_ChazIntro:: @ 818AEDC .string "I'm the middle kid of the BIRD\n" .string "BROTHERS.\p" .string "The best thing about birds…\n" .string "It has to be the wings.$" -Text_18AF39:: @ 818AF39 +FiveIsland_MemorialPillar_Text_ChazDefeat:: @ 818AF39 .string "Flap, flap!$" -Text_18AF45:: @ 818AF45 +FiveIsland_MemorialPillar_Text_ChazPostBattle:: @ 818AF45 .string "There was a really somber guy\n" .string "over that way.$" -Text_18AF72:: @ 818AF72 +FiveIsland_MemorialPillar_Text_HaroldIntro:: @ 818AF72 .string "I'm the youngest of the BIRD\n" .string "BROTHERS.\p" .string "The best thing about birds…\n" .string "It has to be the down.$" -Text_18AFCC:: @ 818AFCC +FiveIsland_MemorialPillar_Text_HaroldDefeat:: @ 818AFCC .string "Down is so comfy…\n" .string "It makes me drowsy…$" -Text_18AFF2:: @ 818AFF2 +FiveIsland_MemorialPillar_Text_HaroldPostBattle:: @ 818AFF2 .string "It fills me with happiness when\n" .string "bird POKéMON beg playfully…$" -gUnknown_818B02E:: @ 818B02E +FiveIsland_MemorialPillar_Text_ScrubScrub:: @ 818B02E .string "Scrub, scrub…$" -gUnknown_818B03C:: @ 818B03C +FiveIsland_MemorialPillar_Text_YourMonsLookHealthy:: @ 818B03C .string "Hello…\n" .string "Your POKéMON look healthy…$" -gUnknown_818B05E:: @ 818B05E +FiveIsland_MemorialPillar_Text_ThisIsWhereIBuriedMyOnix:: @ 818B05E .string "This is where I buried my ONIX…\n" .string "It was named TECTONIX…$" -gUnknown_818B095:: @ 818B095 +FiveIsland_MemorialPillar_Text_HereLiesTectonixLemonadeOffering:: @ 818B095 .string "“Here lies TECTONIX” is engraved\n" .string "on a boulder.\p" .string "There is a LEMONADE placed as an\n" .string "offering in front of the grave.$" -gUnknown_818B105:: @ 818B105 +FiveIsland_MemorialPillar_Text_LeaveAnotherLemonadeOffering:: @ 818B105 .string "Would you like to leave another\n" .string "LEMONADE as an offering?$" -gUnknown_818B13E:: @ 818B13E +FiveIsland_MemorialPillar_Text_PlacedCanOfLemonade:: @ 818B13E .string "{PLAYER} placed a can of LEMONADE\n" .string "in front of the grave.$" -gUnknown_818B171:: @ 818B171 +FiveIsland_MemorialPillar_Text_ThankYouPleaseTakeThis:: @ 818B171 .string "Th-thank you…\p" .string "That was my TECTONIX's favorite\n" .string "drink…\p" @@ -73,25 +73,25 @@ gUnknown_818B171:: @ 818B171 .string "Can you please take this as my\n" .string "thanks?$" -gUnknown_818B219:: @ 818B219 +FiveIsland_MemorialPillar_Text_BeGoodToYourMonsToo:: @ 818B219 .string "Please be good to your POKéMON,\n" .string "too.$" -gUnknown_818B23E:: @ 818B23E +FiveIsland_MemorialPillar_Text_DontHaveRoomForIt:: @ 818B23E .string "If you don't have room for it,\n" .string "I'll hold it for you till next time.$" -gUnknown_818B282:: @ 818B282 +FiveIsland_MemorialPillar_Text_StillHaveThingAsMyThanks:: @ 818B282 .string "Oh, it's you from that time…\p" .string "I still have that thing I wanted\n" .string "you to have as my thanks.$" -gUnknown_818B2DA:: @ 818B2DA +FiveIsland_MemorialPillar_Text_ScrubScrubTectonix:: @ 818B2DA .string "Scrub, scrub…\p" .string "… … …\n" .string "TECTONIX…$" -gUnknown_818B2F8:: @ 818B2F8 +FiveIsland_MemorialPillar_Text_HereLiesTectonix:: @ 818B2F8 .string "Boulders and rocks are neatly piled\n" .string "up as a cairn.\p" .string "“Here lies TECTONIX” is engraved\n" diff --git a/data/maps/FiveIsland_PokemonCenter_1F/map.json b/data/maps/FiveIsland_PokemonCenter_1F/map.json index 5bb403d1c..25b7159c0 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_1F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_PokemonCenter_1F_EventScript_171D00", + "script": "FiveIsland_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_PokemonCenter_1F_EventScript_171D12", + "script": "FiveIsland_PokemonCenter_1F_EventScript_CooltrainerF", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_PokemonCenter_1F_EventScript_171D09", + "script": "FiveIsland_PokemonCenter_1F_EventScript_Chef", "flag": "0" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_PokemonCenter_1F_EventScript_1ACF5F", + "script": "FiveIsland_PokemonCenter_1F_EventScript_PokemonJournal", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { @@ -77,7 +77,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_PokemonCenter_1F_EventScript_1ACF5F", + "script": "FiveIsland_PokemonCenter_1F_EventScript_PokemonJournal", "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], diff --git a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc index 21148cede..c66871fea 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc @@ -7,17 +7,17 @@ FiveIsland_PokemonCenter_1F_OnTransition:: @ 8171CFC setrespawn SPAWN_FIVE_ISLAND end -FiveIsland_PokemonCenter_1F_EventScript_171D00:: @ 8171D00 +FiveIsland_PokemonCenter_1F_EventScript_Nurse:: @ 8171D00 lock faceplayer call EventScript_PkmnCenterNurse release end -FiveIsland_PokemonCenter_1F_EventScript_171D09:: @ 8171D09 - msgbox gUnknown_81A3BBA, MSGBOX_NPC +FiveIsland_PokemonCenter_1F_EventScript_Chef:: @ 8171D09 + msgbox FiveIsland_PokemonCenter_1F_Text_OnMyWayToPrepareMeal, MSGBOX_NPC end -FiveIsland_PokemonCenter_1F_EventScript_171D12:: @ 8171D12 - msgbox gUnknown_81A3BFD, MSGBOX_NPC +FiveIsland_PokemonCenter_1F_EventScript_CooltrainerF:: @ 8171D12 + msgbox FiveIsland_PokemonCenter_1F_Text_YoureOnQuestToCatchEveryMon, MSGBOX_NPC end diff --git a/data/maps/FiveIsland_PokemonCenter_1F/text.inc b/data/maps/FiveIsland_PokemonCenter_1F/text.inc index e1b0e1ea4..3d1be0df1 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/text.inc +++ b/data/maps/FiveIsland_PokemonCenter_1F/text.inc @@ -1,8 +1,8 @@ -gUnknown_81A3BBA:: @ 81A3BBA +FiveIsland_PokemonCenter_1F_Text_OnMyWayToPrepareMeal:: @ 81A3BBA .string "I'm on my way to prepare a meal\n" .string "for a certain high-society person.$" -gUnknown_81A3BFD:: @ 81A3BFD +FiveIsland_PokemonCenter_1F_Text_YoureOnQuestToCatchEveryMon:: @ 81A3BFD .string "You're on a quest to catch every\n" .string "single kind of POKéMON?\p" .string "…How incredible. Please tell me if\n" diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json index ecb514ff8..8b5b3afd4 100644 --- a/data/maps/FiveIsland_ResortGorgeous/map.json +++ b/data/maps/FiveIsland_ResortGorgeous/map.json @@ -31,7 +31,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "FiveIsland_ResortGorgeous_EventScript_1AC127", + "script": "FiveIsland_ResortGorgeous_EventScript_Daisy", "flag": "0" }, { @@ -44,7 +44,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "FiveIsland_ResortGorgeous_EventScript_1AC165", + "script": "FiveIsland_ResortGorgeous_EventScript_Celina", "flag": "0" }, { @@ -57,7 +57,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "FiveIsland_ResortGorgeous_EventScript_1AC1A3", + "script": "FiveIsland_ResortGorgeous_EventScript_Rayna", "flag": "0" }, { @@ -70,7 +70,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "FiveIsland_ResortGorgeous_EventScript_1AC1E1", + "script": "FiveIsland_ResortGorgeous_EventScript_Jacki", "flag": "0" }, { @@ -83,7 +83,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "FiveIsland_ResortGorgeous_EventScript_1AC21F", + "script": "FiveIsland_ResortGorgeous_EventScript_Gillian", "flag": "0" }, { @@ -96,7 +96,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "FiveIsland_ResortGorgeous_EventScript_1AC25D", + "script": "FiveIsland_ResortGorgeous_EventScript_Destin", "flag": "0" }, { @@ -109,7 +109,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "FiveIsland_ResortGorgeous_EventScript_1AC29B", + "script": "FiveIsland_ResortGorgeous_EventScript_Toby", "flag": "0" }, { @@ -189,7 +189,7 @@ "x": 42, "y": 9, "elevation": 0, - "script": "FiveIsland_ResortGorgeous_EventScript_168844" + "script": "FiveIsland_ResortGorgeous_EventScript_SelphysHouseSign" } ] } diff --git a/data/maps/FiveIsland_ResortGorgeous/scripts.inc b/data/maps/FiveIsland_ResortGorgeous/scripts.inc index 4a5502062..c4ef75ed7 100644 --- a/data/maps/FiveIsland_ResortGorgeous/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous/scripts.inc @@ -1,44 +1,46 @@ +.equ LOCALID_SELPHY, 8 + FiveIsland_ResortGorgeous_MapScripts:: @ 81687E4 map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FiveIsland_ResortGorgeous_OnWarp map_script MAP_SCRIPT_ON_FRAME_TABLE, FiveIsland_ResortGorgeous_OnFrame .byte 0 FiveIsland_ResortGorgeous_OnWarp:: @ 81687EF - map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1, EventScript_1687F9 + map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1, FiveIsland_ResortGorgeous_EventScript_TurnPlayerNorth .2byte 0 -EventScript_1687F9:: @ 81687F9 +FiveIsland_ResortGorgeous_EventScript_TurnPlayerNorth:: @ 81687F9 turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end FiveIsland_ResortGorgeous_OnFrame:: @ 81687FE - map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1, EventScript_168808 + map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1, FiveIsland_ResortGorgeous_EventScript_SelphyReturnHomeScene .2byte 0 -EventScript_168808:: @ 8168808 +FiveIsland_ResortGorgeous_EventScript_SelphyReturnHomeScene:: @ 8168808 lockall textcolor 1 - msgbox gUnknown_818A7DB + msgbox FiveIsland_ResortGorgeous_Text_SelphyThanksYouMayGoNow closemessage - applymovement 8, Movement_WalkInPlaceFastestUp + applymovement LOCALID_SELPHY, Movement_WalkInPlaceFastestUp waitmovement 0 opendoor 39, 8 waitdooranim - applymovement 8, Movement_168841 + applymovement LOCALID_SELPHY, FiveIsland_ResortGorgeous_Movement_SelphyEnterHome waitmovement 0 closedoor 39, 8 waitdooranim - removeobject 8 + removeobject LOCALID_SELPHY clearflag FLAG_HIDE_RESORT_GORGEOUS_INSIDE_SELPHY setvar VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 2 releaseall end -Movement_168841:: @ 8168841 +FiveIsland_ResortGorgeous_Movement_SelphyEnterHome:: @ 8168841 walk_up set_invisible step_end -FiveIsland_ResortGorgeous_EventScript_168844:: @ 8168844 - msgbox gUnknown_818A7FE, MSGBOX_SIGN +FiveIsland_ResortGorgeous_EventScript_SelphysHouseSign:: @ 8168844 + msgbox FiveIsland_ResortGorgeous_Text_SelphysHouse, MSGBOX_SIGN end diff --git a/data/maps/FiveIsland_ResortGorgeous/text.inc b/data/maps/FiveIsland_ResortGorgeous/text.inc index d984ab092..7e5ee195f 100644 --- a/data/maps/FiveIsland_ResortGorgeous/text.inc +++ b/data/maps/FiveIsland_ResortGorgeous/text.inc @@ -1,93 +1,93 @@ -Text_18A3E2:: @ 818A3E2 +FiveIsland_ResortGorgeous_Text_DaisyIntro:: @ 818A3E2 .string "With these hands, I will create\n" .string "my victory!$" -Text_18A40E:: @ 818A40E +FiveIsland_ResortGorgeous_Text_DaisyDefeat:: @ 818A40E .string "The shame of this…\n" .string "I'm red-faced…$" -Text_18A430:: @ 818A430 +FiveIsland_ResortGorgeous_Text_DaisyPostBattle:: @ 818A430 .string "Uh-oh, my paint tubes have\n" .string "scattered everywhere!$" -Text_18A461:: @ 818A461 +FiveIsland_ResortGorgeous_Text_CelinaIntro:: @ 818A461 .string "Excuse me!\n" .string "I'm trying to paint.\l" .string "Please keep out of my sight!$" -Text_18A49E:: @ 818A49E +FiveIsland_ResortGorgeous_Text_CelinaDefeat:: @ 818A49E .string "This loss…\n" .string "I feel like I'm whiting out…$" -Text_18A4C6:: @ 818A4C6 +FiveIsland_ResortGorgeous_Text_CelinaPostBattle:: @ 818A4C6 .string "GILLIAN?\n" .string "Please tilt your head slightly…\l" .string "There! That's the look I want!$" -Text_18A50E:: @ 818A50E +FiveIsland_ResortGorgeous_Text_RaynaIntro:: @ 818A50E .string "Hmm…\n" .string "The angle, it is not quite there…$" -Text_18A535:: @ 818A535 +FiveIsland_ResortGorgeous_Text_RaynaDefeat:: @ 818A535 .string "Oh…\n" .string "My feelings, they are blue…$" -Text_18A555:: @ 818A555 +FiveIsland_ResortGorgeous_Text_RaynaPostBattle:: @ 818A555 .string "The sky and the sea…\n" .string "They are so fickle.\p" .string "Their changing expressions make\n" .string "them difficult to capture.$" -Text_18A5B9:: @ 818A5B9 +FiveIsland_ResortGorgeous_Text_JackiIntro:: @ 818A5B9 .string "I am visiting my friend's retreat,\n" .string "if you must know.$" -Text_18A5EE:: @ 818A5EE +FiveIsland_ResortGorgeous_Text_JackiDefeat:: @ 818A5EE .string "Oh, my, so strong.$" -Text_18A601:: @ 818A601 +FiveIsland_ResortGorgeous_Text_JackiPostBattle:: @ 818A601 .string "I find it pleasurable to leisurely\n" .string "battle in the gentle sea breeze.$" -Text_18A645:: @ 818A645 +FiveIsland_ResortGorgeous_Text_GillianIntro:: @ 818A645 .string "I'm thinking of having a pool\n" .string "made specially for POKéMON.$" -Text_18A67F:: @ 818A67F +FiveIsland_ResortGorgeous_Text_GillianDefeat:: @ 818A67F .string "Oh, my goodness gracious!$" -Text_18A699:: @ 818A699 +FiveIsland_ResortGorgeous_Text_GillianPostBattle:: @ 818A699 .string "A pool would be nice, but I must\n" .string "say, a sun-room may be sublime.$" -Text_18A6DA:: @ 818A6DA +FiveIsland_ResortGorgeous_Text_DestinIntro:: @ 818A6DA .string "I'm a good runner.\n" .string "I'm really fast!$" -Text_18A6FE:: @ 818A6FE +FiveIsland_ResortGorgeous_Text_DestinDefeat:: @ 818A6FE .string "Oops!\n" .string "I rushed things!$" -Text_18A715:: @ 818A715 +FiveIsland_ResortGorgeous_Text_DestinPostBattle:: @ 818A715 .string "When I run with the wind, it feels\n" .string "like I could fly!$" -Text_18A74A:: @ 818A74A +FiveIsland_ResortGorgeous_Text_TobyIntro:: @ 818A74A .string "I say, this marine life here at\n" .string "this resort agrees with me.$" -Text_18A786:: @ 818A786 +FiveIsland_ResortGorgeous_Text_TobyDefeat:: @ 818A786 .string "That's a shocker!\n" .string "You must be joking.$" -Text_18A7AC:: @ 818A7AC +FiveIsland_ResortGorgeous_Text_TobyPostBattle:: @ 818A7AC .string "Getting so serious over this…\n" .string "How nonsensical.$" -gUnknown_818A7DB:: @ 818A7DB +FiveIsland_ResortGorgeous_Text_SelphyThanksYouMayGoNow:: @ 818A7DB .string "SELPHY: Thank you.\p" .string "You may go now.$" -gUnknown_818A7FE:: @ 818A7FE +FiveIsland_ResortGorgeous_Text_SelphysHouse:: @ 818A7FE .string "SELPHY'S HOUSE$" diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json index 2c2563031..82cf27051 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/map.json +++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_ResortGorgeous_House_EventScript_171EBE", + "script": "FiveIsland_ResortGorgeous_House_EventScript_Selphy", "flag": "FLAG_HIDE_RESORT_GORGEOUS_INSIDE_SELPHY" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_ResortGorgeous_House_EventScript_172062", + "script": "FiveIsland_ResortGorgeous_House_EventScript_Butler", "flag": "FLAG_HIDE_SELPHYS_BUTLER" } ], diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index 50fe74879..367458ffa 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -1,116 +1,121 @@ +.equ LOCALID_SELPHY, 1 +.equ LOCALID_BUTLER, 2 + +.equ SHOWN_REQUESTED_MON, FLAG_TEMP_2 + FiveIsland_ResortGorgeous_House_MapScripts:: @ 8171EBD .byte 0 -FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE +FiveIsland_ResortGorgeous_House_EventScript_Selphy:: @ 8171EBE goto_if_questlog EventScript_ReleaseEnd special sub_8112364 lock faceplayer - goto_if_set FLAG_TEMP_2, EventScript_172043 + goto_if_set SHOWN_REQUESTED_MON, FiveIsland_ResortGorgeous_House_EventScript_JustFulfilledRequest compare VAR_RESORT_GORGEOUS_REQUESTED_MON, 0xFFFF - goto_if_eq EventScript_171F0B + goto_if_eq FiveIsland_ResortGorgeous_House_EventScript_RequestTookTooLong compare VAR_RESORT_GORGEOUS_REQUESTED_MON, SPECIES_NONE - goto_if_ne EventScript_171F19 - msgbox gUnknown_81A42A0 - goto EventScript_171EFE + goto_if_ne FiveIsland_ResortGorgeous_House_EventScript_CheckForRequestedMon + msgbox FiveIsland_ResortGorgeous_House_Text_PleaseHearMyWish + goto FiveIsland_ResortGorgeous_House_EventScript_RequestMon end -EventScript_171EFE:: @ 8171EFE - special Special_SampleResortGorgeousMonAndReward - msgbox gUnknown_81A4315 +FiveIsland_ResortGorgeous_House_EventScript_RequestMon:: @ 8171EFE + special SampleResortGorgeousMonAndReward + msgbox FiveIsland_ResortGorgeous_House_Text_WishToSeeMonPlease release end -EventScript_171F0B:: @ 8171F0B - msgbox gUnknown_81A437A - goto EventScript_171EFE +FiveIsland_ResortGorgeous_House_EventScript_RequestTookTooLong:: @ 8171F0B + msgbox FiveIsland_ResortGorgeous_House_Text_OhImTiredOfWaiting + goto FiveIsland_ResortGorgeous_House_EventScript_RequestMon end -EventScript_171F19:: @ 8171F19 +FiveIsland_ResortGorgeous_House_EventScript_CheckForRequestedMon:: @ 8171F19 copyvar VAR_0x8004, VAR_RESORT_GORGEOUS_REQUESTED_MON specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies - compare VAR_RESULT, 1 - goto_if_eq EventScript_171F34 - goto EventScript_171EFE + compare VAR_RESULT, TRUE + goto_if_eq FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon + goto FiveIsland_ResortGorgeous_House_EventScript_RequestMon end -EventScript_171F34:: @ 8171F34 - special Special_SampleResortGorgeousMonAndReward - msgbox gUnknown_81A43F7 - addobject 2 - applymovement 2, Movement_172060 +FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon:: @ 8171F34 + special SampleResortGorgeousMonAndReward + msgbox FiveIsland_ResortGorgeous_House_Text_MonYouCaughtForMeThankYou + addobject LOCALID_BUTLER + applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerEnter waitmovement 0 textcolor 0 - msgbox gUnknown_81A450B - applymovement 1, Movement_WalkInPlaceFastestUp + msgbox FiveIsland_ResortGorgeous_House_Text_ButlerYesMyLady + applymovement LOCALID_SELPHY, Movement_WalkInPlaceFastestUp waitmovement 0 textcolor 1 - msgbox gUnknown_81A4521 + msgbox FiveIsland_ResortGorgeous_House_Text_SelphyGiveTokenOfAppreciation textcolor 0 - msgbox gUnknown_81A4566 + msgbox FiveIsland_ResortGorgeous_House_Text_ButlerIShallDoAsYouBid closemessage compare VAR_FACING, DIR_NORTH - call_if_eq EventScript_171FCD + call_if_eq FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerNorth compare VAR_FACING, DIR_SOUTH - call_if_eq EventScript_171FE9 + call_if_eq FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerSouth compare VAR_FACING, DIR_EAST - call_if_eq EventScript_171FFE + call_if_eq FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerEast compare VAR_FACING, DIR_WEST - call_if_eq EventScript_17201A - moveobjectoffscreen 2 - msgbox gUnknown_81A458E + call_if_eq FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerWest + moveobjectoffscreen LOCALID_BUTLER + msgbox FiveIsland_ResortGorgeous_House_Text_ButlerPleaseAcceptThisAsHerThanks giveitem VAR_RESORT_GORGEOUS_REWARD - compare VAR_RESULT, 0 - goto_if_eq EventScript_172025 - setflag FLAG_TEMP_2 - setvar VAR_RESORT_GORGEOUS_REQUESTED_MON, 0 + compare VAR_RESULT, FALSE + goto_if_eq FiveIsland_ResortGorgeous_House_EventScript_NoRoomForReward + setflag SHOWN_REQUESTED_MON + setvar VAR_RESORT_GORGEOUS_REQUESTED_MON, SPECIES_NONE release end -EventScript_171FCD:: @ 8171FCD - applymovement 1, Movement_WalkInPlaceFastestDown - applymovement 2, Movement_17204D +FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerNorth:: @ 8171FCD + applymovement LOCALID_SELPHY, Movement_WalkInPlaceFastestDown + applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerNorth waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return -EventScript_171FE9:: @ 8171FE9 - applymovement 2, Movement_172055 +FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerSouth:: @ 8171FE9 + applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerSouth waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return -EventScript_171FFE:: @ 8171FFE - applymovement 1, Movement_WalkInPlaceFastestLeft - applymovement 2, Movement_172059 +FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerEast:: @ 8171FFE + applymovement LOCALID_SELPHY, Movement_WalkInPlaceFastestLeft + applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerEast waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return -EventScript_17201A:: @ 817201A - applymovement 2, Movement_17205E +FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerWest:: @ 817201A + applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerWest waitmovement 0 return -EventScript_172025:: @ 8172025 +FiveIsland_ResortGorgeous_House_EventScript_NoRoomForReward:: @ 8172025 textcolor 0 - msgbox gUnknown_81A45E8 + msgbox FiveIsland_ResortGorgeous_House_Text_ButlerBagAppearsToBeFull textcolor 1 - msgbox gUnknown_81A461B - setflag FLAG_TEMP_2 - setvar VAR_RESORT_GORGEOUS_REQUESTED_MON, 0 + msgbox FiveIsland_ResortGorgeous_House_Text_OhHowDisappointing + setflag SHOWN_REQUESTED_MON + setvar VAR_RESORT_GORGEOUS_REQUESTED_MON, SPECIES_NONE release end -EventScript_172043:: @ 8172043 - msgbox gUnknown_81A4632 +FiveIsland_ResortGorgeous_House_EventScript_JustFulfilledRequest:: @ 8172043 + msgbox FiveIsland_ResortGorgeous_House_Text_SelphyWishYouBestOfLuck release end -Movement_17204D:: @ 817204D +FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerNorth:: @ 817204D walk_left walk_left walk_left @@ -120,27 +125,30 @@ Movement_17204D:: @ 817204D walk_in_place_fastest_right step_end -Movement_172055:: @ 8172055 +FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerSouth:: @ 8172055 walk_left walk_left walk_in_place_fastest_down step_end -Movement_172059:: @ 8172059 +FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerEast:: @ 8172059 walk_left walk_left walk_left walk_down step_end -Movement_17205E:: @ 817205E +@ Very odd. If the player is talking to Selphy facing West, then the player has clipped through the table +@ In this case rather than approach the player the Butler walks up, which clips the Butler into a wall +FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerWest:: @ 817205E walk_up step_end -Movement_172060:: @ 8172060 +FiveIsland_ResortGorgeous_House_Movement_ButlerEnter:: @ 8172060 walk_in_place_down step_end -FiveIsland_ResortGorgeous_House_EventScript_172062:: @ 8172062 - msgbox gUnknown_81A4657, MSGBOX_NPC +@ Addressed as "Sebastian" but speaks only as "Butler" +FiveIsland_ResortGorgeous_House_EventScript_Butler:: @ 8172062 + msgbox FiveIsland_ResortGorgeous_House_Text_LadySelphySmileHasBrillianceOfSun, MSGBOX_NPC end diff --git a/data/maps/FiveIsland_ResortGorgeous_House/text.inc b/data/maps/FiveIsland_ResortGorgeous_House/text.inc index 1d872274b..cd01000ba 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/text.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/text.inc @@ -1,23 +1,23 @@ -gUnknown_81A42A0:: @ 81A42A0 +FiveIsland_ResortGorgeous_House_Text_PleaseHearMyWish:: @ 81A42A0 .string "SELPHY: Oh?\n" .string "Do I know you from somewhere?\p" .string "Oh, but that doesn't matter.\p" .string "I am exquisitely bored.\n" .string "Please, hear my wish.$" -gUnknown_81A4315:: @ 81A4315 +FiveIsland_ResortGorgeous_House_Text_WishToSeeMonPlease:: @ 81A4315 .string "I wish to see a POKéMON.\n" .string "A darling {STR_VAR_1}.\p" .string "I want to see one right away.\n" .string "Please, make my wish come true.$" -gUnknown_81A437A:: @ 81A437A +FiveIsland_ResortGorgeous_House_Text_OhImTiredOfWaiting:: @ 81A437A .string "SELPHY: Oh, I'm tired of this.\n" .string "I'm tired of waiting for you.\p" .string "I'll forgive you this time, but\n" .string "please don't fail me next time.$" -gUnknown_81A43F7:: @ 81A43F7 +FiveIsland_ResortGorgeous_House_Text_MonYouCaughtForMeThankYou:: @ 81A43F7 .string "SELPHY: Oh, hello, there.\p" .string "Oh, my gracious. That must be the\n" .string "{STR_VAR_1} you caught for me.\p" @@ -32,35 +32,35 @@ gUnknown_81A43F7:: @ 81A43F7 .string "SEBASTIAN!\n" .string "I need you here this instant!$" -gUnknown_81A450B:: @ 81A450B +FiveIsland_ResortGorgeous_House_Text_ButlerYesMyLady:: @ 81A450B .string "Butler: Yes, my lady.$" -gUnknown_81A4521:: @ 81A4521 +FiveIsland_ResortGorgeous_House_Text_SelphyGiveTokenOfAppreciation:: @ 81A4521 .string "SELPHY: See to it that this person\n" .string "is given a token of appreciation.$" -gUnknown_81A4566:: @ 81A4566 +FiveIsland_ResortGorgeous_House_Text_ButlerIShallDoAsYouBid:: @ 81A4566 .string "Butler: I shall do as you bid,\n" .string "my lady.$" -gUnknown_81A458E:: @ 81A458E +FiveIsland_ResortGorgeous_House_Text_ButlerPleaseAcceptThisAsHerThanks:: @ 81A458E .string "Butler: I sincerely thank you for\n" .string "pleasing Lady SELPHY.\p" .string "Please accept this as her thanks…$" -gUnknown_81A45E8:: @ 81A45E8 +FiveIsland_ResortGorgeous_House_Text_ButlerBagAppearsToBeFull:: @ 81A45E8 .string "Butler: Your BAG appears to be\n" .string "unfortunately full.$" -gUnknown_81A461B:: @ 81A461B +FiveIsland_ResortGorgeous_House_Text_OhHowDisappointing:: @ 81A461B .string "Oh…\n" .string "How disappointing.$" -gUnknown_81A4632:: @ 81A4632 +FiveIsland_ResortGorgeous_House_Text_SelphyWishYouBestOfLuck:: @ 81A4632 .string "SELPHY: I wish you the best of\n" .string "luck.$" -gUnknown_81A4657:: @ 81A4657 +FiveIsland_ResortGorgeous_House_Text_LadySelphySmileHasBrillianceOfSun:: @ 81A4657 .string "Butler: The smile of Lady SELPHY\n" .string "has the brilliance of the sun.\p" .string "Please, I beg you to bring joy\n" diff --git a/data/maps/FiveIsland_WaterLabyrinth/map.json b/data/maps/FiveIsland_WaterLabyrinth/map.json index 627ee6b87..2950419f3 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/map.json +++ b/data/maps/FiveIsland_WaterLabyrinth/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_WaterLabyrinth_EventScript_16884E", + "script": "FiveIsland_WaterLabyrinth_EventScript_EggGentleman", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "FiveIsland_WaterLabyrinth_EventScript_1AC2D9", + "script": "FiveIsland_WaterLabyrinth_EventScript_Alize", "flag": "0" } ], diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc index ed82fc5eb..f1080d094 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc @@ -1,68 +1,70 @@ FiveIsland_WaterLabyrinth_MapScripts:: @ 816884D .byte 0 -FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E +FiveIsland_WaterLabyrinth_EventScript_EggGentleman:: @ 816884E goto_if_questlog EventScript_ReleaseEnd special sub_8112364 lock faceplayer - goto_if_set FLAG_GOT_TOGEPI_EGG, EventScript_1688E3 - goto_if_set FLAG_NO_ROOM_FOR_TOGEPI_EGG, EventScript_16892C - msgbox gUnknown_818A80D - specialvar VAR_RESULT, Special_GetLeadMonFriendship - compare VAR_RESULT, 6 - goto_if_eq EventScript_1688AC - msgbox gUnknown_818A88F + goto_if_set FLAG_GOT_TOGEPI_EGG, FiveIsland_WaterLabyrinth_EventScript_PostEggComment + goto_if_set FLAG_NO_ROOM_FOR_TOGEPI_EGG, FiveIsland_WaterLabyrinth_EventScript_ReturnForEgg + msgbox FiveIsland_WaterLabyrinth_Text_LetMeTakeLookAtMons + specialvar VAR_RESULT, GetLeadMonFriendship + compare VAR_RESULT, 6 @ Max friendship + goto_if_eq FiveIsland_WaterLabyrinth_EventScript_LeadMonMaxFriendship + msgbox FiveIsland_WaterLabyrinth_Text_HmmISeeIsee release end -EventScript_168895:: @ 8168895 +FiveIsland_WaterLabyrinth_EventScript_MonDaisyComment:: @ 8168895 famechecker FAMECHECKER_DAISY, 2 - msgbox gUnknown_818AA0C + msgbox FiveIsland_WaterLabyrinth_Text_CuteMonRemindsMeOfDaisy release end -EventScript_1688AC:: @ 81688AC - msgbox gUnknown_818A8A6 - goto EventScript_1688BA +FiveIsland_WaterLabyrinth_EventScript_LeadMonMaxFriendship:: @ 81688AC + msgbox FiveIsland_WaterLabyrinth_Text_TreatMonRightHaveThis + goto FiveIsland_WaterLabyrinth_EventScript_TryGiveEgg end -EventScript_1688BA:: @ 81688BA +FiveIsland_WaterLabyrinth_EventScript_TryGiveEgg:: @ 81688BA getpartysize compare VAR_RESULT, PARTY_SIZE - goto_if_eq EventScript_16891F + goto_if_eq FiveIsland_WaterLabyrinth_EventScript_NoRoomForEgg setflag FLAG_GOT_TOGEPI_EGG giveegg SPECIES_TOGEPI textcolor 3 playfanfare MUS_FANFA1 - message Text_18A91F + message FiveIsland_WaterLabyrinth_Text_ReceivedEggFromMan waitfanfare waitmessage call EventScript_1A6675 - goto EventScript_1688E3 + goto FiveIsland_WaterLabyrinth_EventScript_PostEggComment end -EventScript_1688E3:: @ 81688E3 +@ If the player has a Togepi/Togetic from this game (assumed to be the one the man gave you) then comment on it +@ Otherwise make normal comment +FiveIsland_WaterLabyrinth_EventScript_PostEggComment:: @ 81688E3 getspeciesname 1, SPECIES_TOGEPI setvar VAR_0x8004, SPECIES_TOGEPI - specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID - compare VAR_RESULT, 1 - goto_if_eq EventScript_168895 + specialvar VAR_RESULT, PlayerPartyContainsSpeciesWithPlayerID + compare VAR_RESULT, TRUE + goto_if_eq FiveIsland_WaterLabyrinth_EventScript_MonDaisyComment getspeciesname 1, SPECIES_TOGETIC setvar VAR_0x8004, SPECIES_TOGETIC - specialvar VAR_RESULT, Special_PlayerPartyContainsSpeciesWithPlayerID - compare VAR_RESULT, 1 - goto_if_eq EventScript_168895 - msgbox gUnknown_818A9C0 + specialvar VAR_RESULT, PlayerPartyContainsSpeciesWithPlayerID + compare VAR_RESULT, TRUE + goto_if_eq FiveIsland_WaterLabyrinth_EventScript_MonDaisyComment + msgbox FiveIsland_WaterLabyrinth_Text_GladIMetSomeoneLikeYou release end -EventScript_16891F:: @ 816891F +FiveIsland_WaterLabyrinth_EventScript_NoRoomForEgg:: @ 816891F setflag FLAG_NO_ROOM_FOR_TOGEPI_EGG - msgbox gUnknown_818A940 + msgbox FiveIsland_WaterLabyrinth_Text_DontHaveSpaceInYourParty release end -EventScript_16892C:: @ 816892C - goto EventScript_1688BA +FiveIsland_WaterLabyrinth_EventScript_ReturnForEgg:: @ 816892C + goto FiveIsland_WaterLabyrinth_EventScript_TryGiveEgg end diff --git a/data/maps/FiveIsland_WaterLabyrinth/text.inc b/data/maps/FiveIsland_WaterLabyrinth/text.inc index 111671eb9..c4a5542d3 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/text.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/text.inc @@ -1,4 +1,4 @@ -gUnknown_818A80D:: @ 818A80D +FiveIsland_WaterLabyrinth_Text_LetMeTakeLookAtMons:: @ 818A80D .string "You travel all over the place,\n" .string "don't you?\p" .string "You're not driving your POKéMON\n" @@ -6,38 +6,39 @@ gUnknown_818A80D:: @ 818A80D .string "Let me take a look.\n" .string "… … … … … …$" -gUnknown_818A88F:: @ 818A88F +FiveIsland_WaterLabyrinth_Text_HmmISeeIsee:: @ 818A88F .string "Ah, hmm…\n" .string "I see, I see…$" -gUnknown_818A8A6:: @ 818A8A6 +FiveIsland_WaterLabyrinth_Text_TreatMonRightHaveThis:: @ 818A8A6 .string "Oh, impressive.\n" .string "You treat your POKéMON right.\p" .string "I think you can be entrusted with\n" .string "this.\p" .string "Please, I'd like you to have this.$" -Text_18A91F:: @ 818A91F +FiveIsland_WaterLabyrinth_Text_ReceivedEggFromMan:: @ 818A91F .string "{PLAYER} received an EGG\n" .string "from the man!$" -gUnknown_818A940:: @ 818A940 +FiveIsland_WaterLabyrinth_Text_DontHaveSpaceInYourParty:: @ 818A940 .string "…Unfortunately, you don't have\n" .string "space for this in your party.\p" .string "You'd better come back for it\n" .string "another time.$" -Text_18A9A9:: @ 818A9A9 +@ Unused +FiveIsland_WaterLabyrinth_Text_YouveComeBackForTheEgg:: @ 818A9A9 .string "やあ\n" .string "タマゴを もらいに\l" .string "きて くれたんだね$" -gUnknown_818A9C0:: @ 818A9C0 +FiveIsland_WaterLabyrinth_Text_GladIMetSomeoneLikeYou:: @ 818A9C0 .string "I received that EGG while I was\n" .string "traveling.\p" .string "I'm glad I met someone like you.$" -gUnknown_818AA0C:: @ 818AA0C +FiveIsland_WaterLabyrinth_Text_CuteMonRemindsMeOfDaisy:: @ 818AA0C .string "Oh, hello.\n" .string "That's a cute {STR_VAR_2}.\p" .string "Seeing it reminds me of a sweet \n" @@ -47,3 +48,14 @@ gUnknown_818AA0C:: @ 818AA0C .string "That little girl's name…\n" .string "I think it was DAISY.$" +FiveIsland_WaterLabyrinth_Text_AlizeIntro:: @ 818AAD5 + .string "This is an excellent environment\n" + .string "for raising POKéMON.$" + +FiveIsland_WaterLabyrinth_Text_AlizeDefeat:: @ 818AB0B + .string "Your POKéMON are growing up\n" + .string "admirably well!$" + +FiveIsland_WaterLabyrinth_Text_AlizePostBattle:: @ 818AB37 + .string "You know, I think you have the\n" + .string "talent to be a good BREEDER.$" diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index a64dff1a9..16413d758 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -90,7 +90,7 @@ PalletTown_GarysHouse_EventScript_DeclineGrooming:: @ 8168E3C PalletTown_GarysHouse_EventScript_RateMonFriendship:: @ 8168E46 msgbox PalletTown_GarysHouse_Text_MayISeeFirstMon - specialvar VAR_RESULT, Special_GetLeadMonFriendship + specialvar VAR_RESULT, GetLeadMonFriendship switch VAR_RESULT case 0, PalletTown_GarysHouse_EventScript_MonFriendshipLowest case 1, PalletTown_GarysHouse_EventScript_MonFriendshipLower diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc index c844cc115..78a4137fb 100644 --- a/data/scripts/fame_checker.inc +++ b/data/scripts/fame_checker.inc @@ -151,12 +151,12 @@ FourIsland_Mart_EventScript_1ACF46:: @ 81ACF46 release end -FiveIsland_PokemonCenter_1F_EventScript_1ACF5F:: @ 81ACF5F +FiveIsland_PokemonCenter_1F_EventScript_PokemonJournal:: @ 81ACF5F lock faceplayer famechecker FAMECHECKER_LORELEI, 3 textcolor 3 - msgbox gUnknown_81B187F + msgbox PokemonJournal_Text_SpecialFeatureLorelei release end diff --git a/data/scripts/trainers.inc b/data/scripts/trainers.inc index eaa76b1fa..379235143 100644 --- a/data/scripts/trainers.inc +++ b/data/scripts/trainers.inc @@ -2403,147 +2403,147 @@ EventScript_1AC10C:: @ 81AC10C msgbox Text_18A1B2, MSGBOX_AUTOCLOSE end -FiveIsland_ResortGorgeous_EventScript_1AC127:: @ 81AC127 - trainerbattle_single TRAINER_PAINTER_DAISY, Text_18A3E2, Text_18A40E +FiveIsland_ResortGorgeous_EventScript_Daisy:: @ 81AC127 + trainerbattle_single TRAINER_PAINTER_DAISY, FiveIsland_ResortGorgeous_Text_DaisyIntro, FiveIsland_ResortGorgeous_Text_DaisyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC14E - msgbox Text_18A430, MSGBOX_AUTOCLOSE + goto_if_eq FiveIsland_ResortGorgeous_EventScript_DaisyRematch + msgbox FiveIsland_ResortGorgeous_Text_DaisyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC14E:: @ 81AC14E - trainerbattle_rematch TRAINER_PAINTER_DAISY, Text_1C3BF6, Text_18A40E - msgbox Text_18A430, MSGBOX_AUTOCLOSE +FiveIsland_ResortGorgeous_EventScript_DaisyRematch:: @ 81AC14E + trainerbattle_rematch TRAINER_PAINTER_DAISY, FiveIsland_ResortGorgeous_Text_DaisyRematchIntro, FiveIsland_ResortGorgeous_Text_DaisyDefeat + msgbox FiveIsland_ResortGorgeous_Text_DaisyPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_ResortGorgeous_EventScript_1AC165:: @ 81AC165 - trainerbattle_single TRAINER_PAINTER_CELINA, Text_18A461, Text_18A49E +FiveIsland_ResortGorgeous_EventScript_Celina:: @ 81AC165 + trainerbattle_single TRAINER_PAINTER_CELINA, FiveIsland_ResortGorgeous_Text_CelinaIntro, FiveIsland_ResortGorgeous_Text_CelinaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC18C - msgbox Text_18A4C6, MSGBOX_AUTOCLOSE + goto_if_eq FiveIsland_ResortGorgeous_EventScript_CelinaRematch + msgbox FiveIsland_ResortGorgeous_Text_CelinaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC18C:: @ 81AC18C - trainerbattle_rematch TRAINER_PAINTER_CELINA, Text_1C3C28, Text_18A49E - msgbox Text_18A4C6, MSGBOX_AUTOCLOSE +FiveIsland_ResortGorgeous_EventScript_CelinaRematch:: @ 81AC18C + trainerbattle_rematch TRAINER_PAINTER_CELINA, FiveIsland_ResortGorgeous_Text_CelinaRematchIntro, FiveIsland_ResortGorgeous_Text_CelinaDefeat + msgbox FiveIsland_ResortGorgeous_Text_CelinaPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_ResortGorgeous_EventScript_1AC1A3:: @ 81AC1A3 - trainerbattle_single TRAINER_PAINTER_RAYNA, Text_18A50E, Text_18A535 +FiveIsland_ResortGorgeous_EventScript_Rayna:: @ 81AC1A3 + trainerbattle_single TRAINER_PAINTER_RAYNA, FiveIsland_ResortGorgeous_Text_RaynaIntro, FiveIsland_ResortGorgeous_Text_RaynaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC1CA - msgbox Text_18A555, MSGBOX_AUTOCLOSE + goto_if_eq FiveIsland_ResortGorgeous_EventScript_RaynaRematch + msgbox FiveIsland_ResortGorgeous_Text_RaynaPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC1CA:: @ 81AC1CA - trainerbattle_rematch TRAINER_PAINTER_RAYNA, Text_1C3C70, Text_18A535 - msgbox Text_18A555, MSGBOX_AUTOCLOSE +FiveIsland_ResortGorgeous_EventScript_RaynaRematch:: @ 81AC1CA + trainerbattle_rematch TRAINER_PAINTER_RAYNA, FiveIsland_ResortGorgeous_Text_RaynaRematchIntro, FiveIsland_ResortGorgeous_Text_RaynaDefeat + msgbox FiveIsland_ResortGorgeous_Text_RaynaPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_ResortGorgeous_EventScript_1AC1E1:: @ 81AC1E1 - trainerbattle_single TRAINER_LADY_JACKI, Text_18A5B9, Text_18A5EE +FiveIsland_ResortGorgeous_EventScript_Jacki:: @ 81AC1E1 + trainerbattle_single TRAINER_LADY_JACKI, FiveIsland_ResortGorgeous_Text_JackiIntro, FiveIsland_ResortGorgeous_Text_JackiDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC208 - msgbox Text_18A601, MSGBOX_AUTOCLOSE + goto_if_eq FiveIsland_ResortGorgeous_EventScript_JackiRematch + msgbox FiveIsland_ResortGorgeous_Text_JackiPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC208:: @ 81AC208 - trainerbattle_rematch TRAINER_LADY_JACKI, Text_1C3CB0, Text_18A5EE - msgbox Text_18A601, MSGBOX_AUTOCLOSE +FiveIsland_ResortGorgeous_EventScript_JackiRematch:: @ 81AC208 + trainerbattle_rematch TRAINER_LADY_JACKI, FiveIsland_ResortGorgeous_Text_JackiRematchIntro, FiveIsland_ResortGorgeous_Text_JackiDefeat + msgbox FiveIsland_ResortGorgeous_Text_JackiPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_ResortGorgeous_EventScript_1AC21F:: @ 81AC21F - trainerbattle_single TRAINER_LADY_GILLIAN, Text_18A645, Text_18A67F +FiveIsland_ResortGorgeous_EventScript_Gillian:: @ 81AC21F + trainerbattle_single TRAINER_LADY_GILLIAN, FiveIsland_ResortGorgeous_Text_GillianIntro, FiveIsland_ResortGorgeous_Text_GillianDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC246 - msgbox Text_18A699, MSGBOX_AUTOCLOSE + goto_if_eq FiveIsland_ResortGorgeous_EventScript_GillianRematch + msgbox FiveIsland_ResortGorgeous_Text_GillianPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC246:: @ 81AC246 - trainerbattle_rematch TRAINER_LADY_GILLIAN, Text_1C3CF1, Text_18A67F - msgbox Text_18A699, MSGBOX_AUTOCLOSE +FiveIsland_ResortGorgeous_EventScript_GillianRematch:: @ 81AC246 + trainerbattle_rematch TRAINER_LADY_GILLIAN, FiveIsland_ResortGorgeous_Text_GillianRematchIntro, FiveIsland_ResortGorgeous_Text_GillianDefeat + msgbox FiveIsland_ResortGorgeous_Text_GillianPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_ResortGorgeous_EventScript_1AC25D:: @ 81AC25D - trainerbattle_single TRAINER_YOUNGSTER_DESTIN, Text_18A6DA, Text_18A6FE +FiveIsland_ResortGorgeous_EventScript_Destin:: @ 81AC25D + trainerbattle_single TRAINER_YOUNGSTER_DESTIN, FiveIsland_ResortGorgeous_Text_DestinIntro, FiveIsland_ResortGorgeous_Text_DestinDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC284 - msgbox Text_18A715, MSGBOX_AUTOCLOSE + goto_if_eq FiveIsland_ResortGorgeous_EventScript_DestinRematch + msgbox FiveIsland_ResortGorgeous_Text_DestinPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC284:: @ 81AC284 - trainerbattle_rematch TRAINER_YOUNGSTER_DESTIN, Text_1C3D47, Text_18A6FE - msgbox Text_18A715, MSGBOX_AUTOCLOSE +FiveIsland_ResortGorgeous_EventScript_DestinRematch:: @ 81AC284 + trainerbattle_rematch TRAINER_YOUNGSTER_DESTIN, FiveIsland_ResortGorgeous_Text_DestinRematchIntro, FiveIsland_ResortGorgeous_Text_DestinDefeat + msgbox FiveIsland_ResortGorgeous_Text_DestinPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_ResortGorgeous_EventScript_1AC29B:: @ 81AC29B - trainerbattle_single TRAINER_SWIMMER_MALE_TOBY, Text_18A74A, Text_18A786 +FiveIsland_ResortGorgeous_EventScript_Toby:: @ 81AC29B + trainerbattle_single TRAINER_SWIMMER_MALE_TOBY, FiveIsland_ResortGorgeous_Text_TobyIntro, FiveIsland_ResortGorgeous_Text_TobyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC2C2 - msgbox Text_18A7AC, MSGBOX_AUTOCLOSE + goto_if_eq FiveIsland_ResortGorgeous_EventScript_TobyRematch + msgbox FiveIsland_ResortGorgeous_Text_TobyPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC2C2:: @ 81AC2C2 - trainerbattle_rematch TRAINER_SWIMMER_MALE_TOBY, Text_1C3D73, Text_18A786 - msgbox Text_18A7AC, MSGBOX_AUTOCLOSE +FiveIsland_ResortGorgeous_EventScript_TobyRematch:: @ 81AC2C2 + trainerbattle_rematch TRAINER_SWIMMER_MALE_TOBY, FiveIsland_ResortGorgeous_Text_TobyRematchIntro, FiveIsland_ResortGorgeous_Text_TobyDefeat + msgbox FiveIsland_ResortGorgeous_Text_TobyPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_WaterLabyrinth_EventScript_1AC2D9:: @ 81AC2D9 - trainerbattle_single TRAINER_PKMN_BREEDER_ALIZE, Text_18AAD5, Text_18AB0B +FiveIsland_WaterLabyrinth_EventScript_Alize:: @ 81AC2D9 + trainerbattle_single TRAINER_PKMN_BREEDER_ALIZE, FiveIsland_WaterLabyrinth_Text_AlizeIntro, FiveIsland_WaterLabyrinth_Text_AlizeDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC300 - msgbox Text_18AB37, MSGBOX_AUTOCLOSE + goto_if_eq FiveIsland_WaterLabyrinth_EventScript_AlizeRematch + msgbox FiveIsland_WaterLabyrinth_Text_AlizePostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC300:: @ 81AC300 - trainerbattle_rematch TRAINER_PKMN_BREEDER_ALIZE, Text_1C3BB7, Text_18AB0B - msgbox Text_18AB37, MSGBOX_AUTOCLOSE +FiveIsland_WaterLabyrinth_EventScript_AlizeRematch:: @ 81AC300 + trainerbattle_rematch TRAINER_PKMN_BREEDER_ALIZE, FiveIsland_WaterLabyrinth_Text_AlizeRematchIntro, FiveIsland_WaterLabyrinth_Text_AlizeDefeat + msgbox FiveIsland_WaterLabyrinth_Text_AlizePostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_MemorialPillar_EventScript_1AC317:: @ 81AC317 - trainerbattle_single TRAINER_BIRD_KEEPER_MILO, Text_18AE50, Text_18AEA8 +FiveIsland_MemorialPillar_EventScript_Milo:: @ 81AC317 + trainerbattle_single TRAINER_BIRD_KEEPER_MILO, FiveIsland_MemorialPillar_Text_MiloIntro, FiveIsland_MemorialPillar_Text_MiloDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC33E - msgbox Text_18AEB6, MSGBOX_AUTOCLOSE + goto_if_eq FiveIsland_MemorialPillar_EventScript_MiloRematch + msgbox FiveIsland_MemorialPillar_Text_MiloPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC33E:: @ 81AC33E - trainerbattle_rematch TRAINER_BIRD_KEEPER_MILO, Text_1C3DA2, Text_18AEA8 - msgbox Text_18AEB6, MSGBOX_AUTOCLOSE +FiveIsland_MemorialPillar_EventScript_MiloRematch:: @ 81AC33E + trainerbattle_rematch TRAINER_BIRD_KEEPER_MILO, FiveIsland_MemorialPillar_Text_MiloRematchIntro, FiveIsland_MemorialPillar_Text_MiloDefeat + msgbox FiveIsland_MemorialPillar_Text_MiloPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_MemorialPillar_EventScript_1AC355:: @ 81AC355 - trainerbattle_single TRAINER_BIRD_KEEPER_CHAZ, Text_18AEDC, Text_18AF39 +FiveIsland_MemorialPillar_EventScript_Chaz:: @ 81AC355 + trainerbattle_single TRAINER_BIRD_KEEPER_CHAZ, FiveIsland_MemorialPillar_Text_ChazIntro, FiveIsland_MemorialPillar_Text_ChazDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC37C - msgbox Text_18AF45, MSGBOX_AUTOCLOSE + goto_if_eq FiveIsland_MemorialPillar_EventScript_ChazRematch + msgbox FiveIsland_MemorialPillar_Text_ChazPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC37C:: @ 81AC37C - trainerbattle_rematch TRAINER_BIRD_KEEPER_CHAZ, Text_1C3E0F, Text_18AF39 - msgbox Text_18AF45, MSGBOX_AUTOCLOSE +FiveIsland_MemorialPillar_EventScript_ChazRematch:: @ 81AC37C + trainerbattle_rematch TRAINER_BIRD_KEEPER_CHAZ, FiveIsland_MemorialPillar_Text_ChazRematchIntro, FiveIsland_MemorialPillar_Text_ChazDefeat + msgbox FiveIsland_MemorialPillar_Text_ChazPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_MemorialPillar_EventScript_1AC393:: @ 81AC393 - trainerbattle_single TRAINER_BIRD_KEEPER_HAROLD, Text_18AF72, Text_18AFCC +FiveIsland_MemorialPillar_EventScript_Harold:: @ 81AC393 + trainerbattle_single TRAINER_BIRD_KEEPER_HAROLD, FiveIsland_MemorialPillar_Text_HaroldIntro, FiveIsland_MemorialPillar_Text_HaroldDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE - goto_if_eq EventScript_1AC3BA - msgbox Text_18AFF2, MSGBOX_AUTOCLOSE + goto_if_eq FiveIsland_MemorialPillar_EventScript_HaroldRematch + msgbox FiveIsland_MemorialPillar_Text_HaroldPostBattle, MSGBOX_AUTOCLOSE end -EventScript_1AC3BA:: @ 81AC3BA - trainerbattle_rematch TRAINER_BIRD_KEEPER_HAROLD, Text_1C3E6A, Text_18AFCC - msgbox Text_18AFF2, MSGBOX_AUTOCLOSE +FiveIsland_MemorialPillar_EventScript_HaroldRematch:: @ 81AC3BA + trainerbattle_rematch TRAINER_BIRD_KEEPER_HAROLD, FiveIsland_MemorialPillar_Text_HaroldRematchIntro, FiveIsland_MemorialPillar_Text_HaroldDefeat + msgbox FiveIsland_MemorialPillar_Text_HaroldPostBattle, MSGBOX_AUTOCLOSE end SixIsland_OutcastIsland_EventScript_1AC3D1:: @ 81AC3D1 diff --git a/data/specials.inc b/data/specials.inc index 19ea756a7..d995179c8 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -238,7 +238,7 @@ gSpecials:: @ 815FD60 def_special Special_GetPlayerAvatarBike def_special nullsub_75 def_special nullsub_75 - def_special Special_GetLeadMonFriendship + def_special GetLeadMonFriendship def_special ScrSpecial_BattleTowerMapScript2 def_special ChooseNextBattleTowerTrainer def_special CheckPartyBattleTowerBanlist @@ -357,7 +357,7 @@ gSpecials:: @ 815FD60 def_special sub_80CADC4 def_special Special_SetVermilionTrashCans def_special sub_805D1A8 - def_special Special_SampleResortGorgeousMonAndReward + def_special SampleResortGorgeousMonAndReward def_special Special_CheckAddCoins def_special GetDaycarePokemonCount def_special Special_CloseElevatorCurrentFloorWindow @@ -444,7 +444,7 @@ gSpecials:: @ 815FD60 def_special Special_PlayerIsNotInTrainerTowerLobby def_special Special_BrailleCursorToggle def_special Script_ResetUnionRoomTrade - def_special Special_PlayerPartyContainsSpeciesWithPlayerID + def_special PlayerPartyContainsSpeciesWithPlayerID def_special AnimateTeleporterHousing def_special IsDodrioInParty def_special AnimateTeleporterCable diff --git a/data/text/fame_checker.inc b/data/text/fame_checker.inc index a8226df05..e6acb6877 100644 --- a/data/text/fame_checker.inc +++ b/data/text/fame_checker.inc @@ -1429,7 +1429,7 @@ gUnknown_81B17E9:: @ 81B17E9 .string "shades only when he is thinking up\l" .string "new quiz questions.$" -gUnknown_81B187F:: @ 81B187F +PokemonJournal_Text_SpecialFeatureLorelei:: @ 81B187F .string "POKéMON JOURNAL\p" .string "Special Feature:\n" .string "ELITE FOUR's LORELEI!\p" diff --git a/data/text/trainers.inc b/data/text/trainers.inc index 7a51a0585..23fcbc2dc 100644 --- a/data/text/trainers.inc +++ b/data/text/trainers.inc @@ -791,54 +791,54 @@ Text_1C3B6E:: @ 81C3B6E Text_1C3B99:: @ 81C3B99 .string "MEG: You can't beat us today!$" -Text_1C3BB7:: @ 81C3BB7 +FiveIsland_WaterLabyrinth_Text_AlizeRematchIntro:: @ 81C3BB7 .string "Oh, hello!\p" .string "Are you raising your POKéMON in a\n" .string "good environment?$" -Text_1C3BF6:: @ 81C3BF6 +FiveIsland_ResortGorgeous_Text_DaisyRematchIntro:: @ 81C3BF6 .string "With these hands, I will create\n" .string "my victory today.$" -Text_1C3C28:: @ 81C3C28 +FiveIsland_ResortGorgeous_Text_CelinaRematchIntro:: @ 81C3C28 .string "Must I repeat myself?\n" .string "I'm trying to paint.\l" .string "Please keep out of my sight!$" -Text_1C3C70:: @ 81C3C70 +FiveIsland_ResortGorgeous_Text_RaynaRematchIntro:: @ 81C3C70 .string "I haven't made any progress…\n" .string "I still can't get the right angle…$" -Text_1C3CB0:: @ 81C3CB0 +FiveIsland_ResortGorgeous_Text_JackiRematchIntro:: @ 81C3CB0 .string "Oh, you will give me another\n" .string "opportunity to match wits with you?$" -Text_1C3CF1:: @ 81C3CF1 +FiveIsland_ResortGorgeous_Text_GillianRematchIntro:: @ 81C3CF1 .string "They're almost finished making the\n" .string "pool for my POKéMON.\p" .string "You must drop in for a visit.$" -Text_1C3D47:: @ 81C3D47 +FiveIsland_ResortGorgeous_Text_DestinRematchIntro:: @ 81C3D47 .string "I'm a good runner.\n" .string "I've gotten even faster!$" -Text_1C3D73:: @ 81C3D73 +FiveIsland_ResortGorgeous_Text_TobyRematchIntro:: @ 81C3D73 .string "I say, friend!\n" .string "Let us enjoy our time together!$" -Text_1C3DA2:: @ 81C3DA2 +FiveIsland_MemorialPillar_Text_MiloRematchIntro:: @ 81C3DA2 .string "I'm the eldest of the BIRD\n" .string "BROTHERS. Remember me?\p" .string "That's right, I'm the one who loves\n" .string "birds for their beaks!$" -Text_1C3E0F:: @ 81C3E0F +FiveIsland_MemorialPillar_Text_ChazRematchIntro:: @ 81C3E0F .string "I'm the middle kid of the BIRD\n" .string "BROTHERS.\p" .string "I'm the one that loves wings.\n" .string "Let's battle again!$" -Text_1C3E6A:: @ 81C3E6A +FiveIsland_MemorialPillar_Text_HaroldRematchIntro:: @ 81C3E6A .string "I'm the youngest of the BIRD\n" .string "BROTHERS.\p" .string "I love birds for their down.\n" |