From 43116d96c34b04a8a8729da849b6fb99c1574e1f Mon Sep 17 00:00:00 2001 From: Robin Xyifer Date: Wed, 26 Feb 2025 16:29:38 -0600 Subject: [PATCH] Condensed duplicate Fallarbor Town Sign text scripts, from 3 to 1. Modified MeteorFalls maps to use condensed script. Compare OK. --- data/maps/FallarborTown/scripts.inc | 2 -- data/maps/MeteorFalls_1F_1R/map.json | 2 +- data/maps/MeteorFalls_1F_2R/map.json | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc index 39380279b..796bd9d21 100644 --- a/data/maps/FallarborTown/scripts.inc +++ b/data/maps/FallarborTown/scripts.inc @@ -45,8 +45,6 @@ FallarborTown_EventScript_ContestHallSign:: @ 814E839 end FallarborTown_EventScript_TownSign:: @ 814E842 -MeteorFalls_1F_1R_EventScript_TownSign:: @ 814E842 -MeteorFalls_1F_2R_EventScript_TownSign:: @ 814E842 msgbox FallarborTown_Text_TownSign, MSGBOX_SIGN end diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json index 60e976b57..daf8eb9ae 100644 --- a/data/maps/MeteorFalls_1F_1R/map.json +++ b/data/maps/MeteorFalls_1F_1R/map.json @@ -197,7 +197,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MeteorFalls_1F_1R_EventScript_TownSign" + "script": "FallarborTown_EventScript_TownSign" }, { "type": "sign", diff --git a/data/maps/MeteorFalls_1F_2R/map.json b/data/maps/MeteorFalls_1F_2R/map.json index 73e6f9b87..de3bd4d7b 100644 --- a/data/maps/MeteorFalls_1F_2R/map.json +++ b/data/maps/MeteorFalls_1F_2R/map.json @@ -89,7 +89,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "MeteorFalls_1F_2R_EventScript_TownSign" + "script": "FallarborTown_EventScript_TownSign" }, { "type": "sign",