From c2bf668fdd63b246a04e3e833e2eaef963cfb17b Mon Sep 17 00:00:00 2001
From: GriffinR <25753467+GriffinRichards@users.noreply.github.com>
Date: Mon, 5 Aug 2019 11:23:45 -0400
Subject: rename town/city vars

---
 data/maps/LavaridgeTown/scripts.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'data/maps/LavaridgeTown/scripts.inc')

diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc
index 9e20673b7..de1a2bcee 100644
--- a/data/maps/LavaridgeTown/scripts.inc
+++ b/data/maps/LavaridgeTown/scripts.inc
@@ -9,9 +9,9 @@ LavaridgeTown_OnTransition: @ 81EA4DE
 	call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_1EA53F
 	call Common_EventScript_SetupRivalGender
 	call Common_EventScript_SetupRivalOnBikeGender
-	compare VAR_LAVARIDGE_RIVAL_STATE, 1
+	compare VAR_LAVARIDGE_TOWN_STATE, 1
 	call_if_eq LavaridgeTown_EventScript_1EA518
-	compare VAR_LAVARIDGE_RIVAL_STATE, 1
+	compare VAR_LAVARIDGE_TOWN_STATE, 1
 	call_if_eq LavaridgeTown_EventScript_1EA543
 	end
 
@@ -41,7 +41,7 @@ LavaridgeTown_EventScript_1EA543:: @ 81EA543
 	return
 
 LavaridgeTown_MapScript2_1EA547: @ 81EA547
-	map_script_2 VAR_LAVARIDGE_RIVAL_STATE, 1, LavaridgeTown_EventScript_1EA551
+	map_script_2 VAR_LAVARIDGE_TOWN_STATE, 1, LavaridgeTown_EventScript_1EA551
 	.2byte 0
 
 LavaridgeTown_EventScript_1EA551:: @ 81EA551
@@ -94,7 +94,7 @@ LavaridgeTown_EventScript_1EA5FF:: @ 81EA5FF
 	compare VAR_0x8008, 9
 	call_if_ne LavaridgeTown_EventScript_1EA6C9
 	removeobject 7
-	setvar VAR_LAVARIDGE_RIVAL_STATE, 2
+	setvar VAR_LAVARIDGE_TOWN_STATE, 2
 	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	savebgm MUS_DUMMY
 	fadedefaultbgm
-- 
cgit v1.2.3