From 47308706465639ab1dcfd1c03227e7e23edb616c Mon Sep 17 00:00:00 2001 From: tustin2121 Date: Tue, 18 Oct 2022 21:12:31 -0400 Subject: [PATCH] VAR_RUN_TRIGGER_IMMEDIATELY -> TRIGGER_RUN_IMMEDIATELY Getting rid of the VAR_ prefix, to avoid the porymap problem. --- data/maps/FarawayIsland_Entrance/map.json | 6 +-- data/maps/LavaridgeTown/map.json | 2 +- data/maps/MtPyre_Exterior/map.json | 10 ++--- data/maps/Route111/map.json | 48 +++++++++++------------ data/maps/RusturfTunnel/map.json | 6 +-- include/constants/vars.h | 2 +- src/field_control_avatar.c | 2 +- 7 files changed, 38 insertions(+), 38 deletions(-) diff --git a/data/maps/FarawayIsland_Entrance/map.json b/data/maps/FarawayIsland_Entrance/map.json index 5f8e4bc5d..4f9e17800 100644 --- a/data/maps/FarawayIsland_Entrance/map.json +++ b/data/maps/FarawayIsland_Entrance/map.json @@ -63,7 +63,7 @@ "x": 9, "y": 18, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "FarawayIsland_Entrance_EventScript_SetCloudsWeather" }, @@ -72,7 +72,7 @@ "x": 10, "y": 20, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "FarawayIsland_Entrance_EventScript_ClearWeather" }, @@ -81,7 +81,7 @@ "x": 22, "y": 9, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "FarawayIsland_Entrance_EventScript_SetCloudsWeather" } diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json index faddcea49..a23f98d05 100644 --- a/data/maps/LavaridgeTown/map.json +++ b/data/maps/LavaridgeTown/map.json @@ -188,7 +188,7 @@ "x": 6, "y": 3, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "LavaridgeTown_EventScript_HotSpringsTrigger" } diff --git a/data/maps/MtPyre_Exterior/map.json b/data/maps/MtPyre_Exterior/map.json index 1b022a878..8e1804237 100644 --- a/data/maps/MtPyre_Exterior/map.json +++ b/data/maps/MtPyre_Exterior/map.json @@ -70,7 +70,7 @@ "x": 24, "y": 21, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "MtPyre_Exterior_EventScript_FogTrigger" }, @@ -79,7 +79,7 @@ "x": 25, "y": 21, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "MtPyre_Exterior_EventScript_FogTrigger" }, @@ -88,7 +88,7 @@ "x": 22, "y": 27, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "MtPyre_Exterior_EventScript_SunTrigger" }, @@ -97,7 +97,7 @@ "x": 23, "y": 28, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "MtPyre_Exterior_EventScript_SunTrigger" }, @@ -106,7 +106,7 @@ "x": 26, "y": 21, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "MtPyre_Exterior_EventScript_FogTrigger" } diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json index b403b9810..033bf224a 100644 --- a/data/maps/Route111/map.json +++ b/data/maps/Route111/map.json @@ -672,7 +672,7 @@ "x": 12, "y": 62, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "Route111_EventScript_SandstormTrigger" }, @@ -708,7 +708,7 @@ "x": 7, "y": 63, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "Route111_EventScript_SunTrigger" }, @@ -762,7 +762,7 @@ "x": 18, "y": 32, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "Route111_EventScript_SunTrigger" }, @@ -771,7 +771,7 @@ "x": 17, "y": 31, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "Route111_EventScript_SunTrigger" }, @@ -780,7 +780,7 @@ "x": 9, "y": 37, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "Route111_EventScript_SunTrigger" }, @@ -789,7 +789,7 @@ "x": 10, "y": 36, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "Route111_EventScript_SunTrigger" }, @@ -816,7 +816,7 @@ "x": 8, "y": 64, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "Route111_EventScript_SunTrigger" }, @@ -825,7 +825,7 @@ "x": 9, "y": 65, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "Route111_EventScript_SunTrigger" }, @@ -834,7 +834,7 @@ "x": 10, "y": 65, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "Route111_EventScript_SunTrigger" }, @@ -843,7 +843,7 @@ "x": 11, "y": 66, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "Route111_EventScript_SunTrigger" }, @@ -852,7 +852,7 @@ "x": 12, "y": 67, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "Route111_EventScript_SunTrigger" }, @@ -861,7 +861,7 @@ "x": 13, "y": 68, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "Route111_EventScript_SunTrigger" }, @@ -870,7 +870,7 @@ "x": 14, "y": 69, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "Route111_EventScript_SunTrigger" }, @@ -879,7 +879,7 @@ "x": 10, "y": 61, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "Route111_EventScript_SandstormTrigger" }, @@ -888,7 +888,7 @@ "x": 11, "y": 62, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "Route111_EventScript_SandstormTrigger" }, @@ -897,7 +897,7 @@ "x": 13, "y": 62, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "Route111_EventScript_SandstormTrigger" }, @@ -906,7 +906,7 @@ "x": 14, "y": 62, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "Route111_EventScript_SandstormTrigger" }, @@ -915,7 +915,7 @@ "x": 17, "y": 38, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "Route111_EventScript_SandstormTrigger" }, @@ -924,7 +924,7 @@ "x": 16, "y": 39, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "Route111_EventScript_SandstormTrigger" }, @@ -933,7 +933,7 @@ "x": 15, "y": 40, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "Route111_EventScript_SandstormTrigger" }, @@ -942,7 +942,7 @@ "x": 14, "y": 41, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "Route111_EventScript_SandstormTrigger" }, @@ -951,7 +951,7 @@ "x": 13, "y": 42, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "Route111_EventScript_SandstormTrigger" }, @@ -960,7 +960,7 @@ "x": 12, "y": 43, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "Route111_EventScript_SandstormTrigger" }, @@ -969,7 +969,7 @@ "x": 11, "y": 44, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "Route111_EventScript_SandstormTrigger" } diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json index 4c3dffd48..c519c46bd 100644 --- a/data/maps/RusturfTunnel/map.json +++ b/data/maps/RusturfTunnel/map.json @@ -174,7 +174,7 @@ "x": 23, "y": 4, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "RusturfTunnel_EventScript_TunnelBlockagePos1" }, @@ -201,7 +201,7 @@ "x": 25, "y": 4, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "RusturfTunnel_EventScript_TunnelBlockagePos2" }, @@ -210,7 +210,7 @@ "x": 25, "y": 5, "elevation": 3, - "var": "VAR_RUN_TRIGGER_IMMEDIATELY", + "var": "TRIGGER_RUN_IMMEDIATELY", "var_value": "0", "script": "RusturfTunnel_EventScript_TunnelBlockagePos3" } diff --git a/include/constants/vars.h b/include/constants/vars.h index c63eed25f..be32c7498 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -308,6 +308,6 @@ // then the script will be run using RunScriptImmediately instead of in the // global script context. This means it will run faster, but cannot do any // cutscenes nor call a wait command. Used for weather effects in vanilla. -#define VAR_RUN_TRIGGER_IMMEDIATELY 0 +#define TRIGGER_RUN_IMMEDIATELY 0 #endif // GUARD_CONSTANTS_VARS_H diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 99f931303..effc9c91c 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -884,7 +884,7 @@ static u8 *TryRunCoordEventScript(struct CoordEvent *coordEvent) DoCoordEventWeather(coordEvent->trigger); return NULL; } - if (coordEvent->trigger == VAR_RUN_TRIGGER_IMMEDIATELY) + if (coordEvent->trigger == TRIGGER_RUN_IMMEDIATELY) { RunScriptImmediately(coordEvent->script); return NULL;