Sync temp vars

4 files changed, 76 insertions, 76 deletions

diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc
index 6db5e89ff..f20768d88 100644
--- a/data/scripts/mystery_event_club.inc
+++ b/data/scripts/mystery_event_club.inc
@@ -1,7 +1,7 @@
 PewterCity_PokemonCenter_1F_EventScript_1BEE16:: @ 81BEE16
 	lock
 	faceplayer
-	compare VAR_0x4001, 1
+	compare VAR_TEMP_1, 1
 	goto_if eq, EventScript_1BEE3A
 	checkflag FLAG_SYS_SET_TRAINER_CARD_PROFILE
 	goto_if TRUE, EventScript_1BEECD
@@ -42,7 +42,7 @@ EventScript_1BEE9E:: @ 81BEE9E
 	end
 
 EventScript_1BEEA8:: @ 81BEEA8
-	setvar VAR_0x4001, 1
+	setvar VAR_TEMP_1, 1
 	setvar VAR_0x8004, 0
 	special Special_BufferEasyChatMessage
 	waitmessage
@@ -89,7 +89,7 @@ EventScript_1BEF35:: @ 81BEF35
 	end
 
 EventScript_1BEF3F:: @ 81BEF3F
-	setvar VAR_0x4001, 1
+	setvar VAR_TEMP_1, 1
 	setvar VAR_0x8004, 0
 	special Special_BufferEasyChatMessage
 	waitmessage
diff --git a/data/scripts/route23.inc b/data/scripts/route23.inc
index fe2baa17a..77409e539 100644
--- a/data/scripts/route23.inc
+++ b/data/scripts/route23.inc
@@ -30,9 +30,9 @@ EventScript_1A77F9:: @ 81A77F9
 	end
 
 EventScript_1A7803:: @ 81A7803
-	compare VAR_MAP_SCENE_ROUTE23, VAR_0x4001
+	compare VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1
 	goto_if ge, EventScript_1A77EC
-	switch VAR_0x4001
+	switch VAR_TEMP_1
 	case 1, EventScript_1A78D5
 	case 2, EventScript_1A78E4
 	case 3, EventScript_1A78F3
@@ -44,9 +44,9 @@ EventScript_1A7803:: @ 81A7803
 	end
 
 EventScript_1A786C:: @ 81A786C
-	compare VAR_MAP_SCENE_ROUTE23, VAR_0x4001
+	compare VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1
 	goto_if ge, EventScript_1A77F9
-	switch VAR_0x4001
+	switch VAR_TEMP_1
 	case 1, EventScript_1A78D5
 	case 2, EventScript_1A78E4
 	case 3, EventScript_1A78F3
@@ -111,13 +111,13 @@ EventScript_1A794D:: @ 81A794D
 	playfanfare MUS_FANFA1
 	waitfanfare
 	waitbuttonpress
-	copyvar VAR_MAP_SCENE_ROUTE23, VAR_0x4001
+	copyvar VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1
 	release
 	end
 
 EventScript_1A795F:: @ 81A795F
 	msgbox Text_OnlyPassWithBadgeOhGoAhead
-	copyvar VAR_MAP_SCENE_ROUTE23, VAR_0x4001
+	copyvar VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1
 	release
 	end
 
@@ -125,7 +125,7 @@ EventScript_1A796E:: @ 81A796E
 	textcolor 0
 	applymovement VAR_0x8009, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	switch VAR_0x4001
+	switch VAR_TEMP_1
 	case 1, EventScript_1A79D8
 	case 2, EventScript_1A79E7
 	case 3, EventScript_1A79F6
@@ -214,13 +214,13 @@ EventScript_1A7A96:: @ 81A7A96
 	playfanfare MUS_FANFA1
 	waitfanfare
 	waitbuttonpress
-	copyvar VAR_MAP_SCENE_ROUTE23, VAR_0x4001
+	copyvar VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1
 	releaseall
 	end
 
 EventScript_1A7AA8:: @ 81A7AA8
 	msgbox Text_OnlyPassWithBadgeOhGoAhead
-	copyvar VAR_MAP_SCENE_ROUTE23, VAR_0x4001
+	copyvar VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1
 	releaseall
 	end
 
diff --git a/data/scripts/silphco_doors.inc b/data/scripts/silphco_doors.inc
index 07e1db17d..13c59caa7 100644
--- a/data/scripts/silphco_doors.inc
+++ b/data/scripts/silphco_doors.inc
@@ -348,7 +348,7 @@ EventScript_Open11FDoor:: @ 81A88ED
 
 SilphCo_2F_EventScript_Door1:: @ 81A891B
     lockall
-    setvar VAR_0x4001, 1
+    setvar VAR_TEMP_1, 1
     setvar VAR_0x8004, 634
     checkflag FLAG_SILPH_2F_DOOR_1
     goto_if TRUE, EventScript_DoorUnlocked
@@ -357,7 +357,7 @@ SilphCo_2F_EventScript_Door1:: @ 81A891B
 
 SilphCo_2F_EventScript_Door2:: @ 81A8935
     lockall
-    setvar VAR_0x4001, 2
+    setvar VAR_TEMP_1, 2
     setvar VAR_0x8004, 635
     checkflag FLAG_SILPH_2F_DOOR_2
     goto_if TRUE, EventScript_DoorUnlocked
@@ -366,7 +366,7 @@ SilphCo_2F_EventScript_Door2:: @ 81A8935
 
 SilphCo_3F_EventScript_Door1:: @ 81A894F
     lockall
-    setvar VAR_0x4001, 3
+    setvar VAR_TEMP_1, 3
     setvar VAR_0x8004, 636
     checkflag FLAG_SILPH_3F_DOOR_1
     goto_if TRUE, EventScript_DoorUnlocked
@@ -375,7 +375,7 @@ SilphCo_3F_EventScript_Door1:: @ 81A894F
 
 SilphCo_3F_EventScript_Door2:: @ 81A8969
     lockall
-    setvar VAR_0x4001, 4
+    setvar VAR_TEMP_1, 4
     setvar VAR_0x8004, 637
     checkflag FLAG_SILPH_3F_DOOR_2
     goto_if TRUE, EventScript_DoorUnlocked
@@ -384,7 +384,7 @@ SilphCo_3F_EventScript_Door2:: @ 81A8969
 
 SilphCo_4F_EventScript_Door1:: @ 81A8983
     lockall
-    setvar VAR_0x4001, 5
+    setvar VAR_TEMP_1, 5
     setvar VAR_0x8004, 638
     checkflag FLAG_SILPH_4F_DOOR_1
     goto_if TRUE, EventScript_DoorUnlocked
@@ -393,7 +393,7 @@ SilphCo_4F_EventScript_Door1:: @ 81A8983
 
 SilphCo_4F_EventScript_Door2:: @ 81A899D
     lockall
-    setvar VAR_0x4001, 6
+    setvar VAR_TEMP_1, 6
     setvar VAR_0x8004, 639
     checkflag FLAG_SILPH_4F_DOOR_2
     goto_if TRUE, EventScript_DoorUnlocked
@@ -402,7 +402,7 @@ SilphCo_4F_EventScript_Door2:: @ 81A899D
 
 SilphCo_5F_EventScript_Door1:: @ 81A89B7
     lockall
-    setvar VAR_0x4001, 7
+    setvar VAR_TEMP_1, 7
     setvar VAR_0x8004, 640
     checkflag FLAG_SILPH_5F_DOOR_1
     goto_if TRUE, EventScript_DoorUnlocked
@@ -411,7 +411,7 @@ SilphCo_5F_EventScript_Door1:: @ 81A89B7
 
 SilphCo_5F_EventScript_Door2:: @ 81A89D1
     lockall
-    setvar VAR_0x4001, 8
+    setvar VAR_TEMP_1, 8
     setvar VAR_0x8004, 641
     checkflag FLAG_SILPH_5F_DOOR_2
     goto_if TRUE, EventScript_DoorUnlocked
@@ -420,7 +420,7 @@ SilphCo_5F_EventScript_Door2:: @ 81A89D1
 
 SilphCo_5F_EventScript_Door3:: @ 81A89EB
     lockall
-    setvar VAR_0x4001, 9
+    setvar VAR_TEMP_1, 9
     setvar VAR_0x8004, 642
     checkflag FLAG_SILPH_5F_DOOR_3
     goto_if TRUE, EventScript_DoorUnlocked
@@ -429,7 +429,7 @@ SilphCo_5F_EventScript_Door3:: @ 81A89EB
 
 SilphCo_6F_EventScript_Door:: @ 81A8A05
     lockall
-    setvar VAR_0x4001, 10
+    setvar VAR_TEMP_1, 10
     setvar VAR_0x8004, 643
     checkflag FLAG_SILPH_6F_DOOR
     goto_if TRUE, EventScript_DoorUnlocked
@@ -438,7 +438,7 @@ SilphCo_6F_EventScript_Door:: @ 81A8A05
 
 SilphCo_7F_EventScript_Door1:: @ 81A8A1F
     lockall
-    setvar VAR_0x4001, 11
+    setvar VAR_TEMP_1, 11
     setvar VAR_0x8004, 644
     checkflag FLAG_SILPH_7F_DOOR_1
     goto_if TRUE, EventScript_DoorUnlocked
@@ -447,7 +447,7 @@ SilphCo_7F_EventScript_Door1:: @ 81A8A1F
 
 SilphCo_7F_EventScript_Door2:: @ 81A8A39
     lockall
-    setvar VAR_0x4001, 12
+    setvar VAR_TEMP_1, 12
     setvar VAR_0x8004, 645
     checkflag FLAG_SILPH_7F_DOOR_2
     goto_if TRUE, EventScript_DoorUnlocked
@@ -456,7 +456,7 @@ SilphCo_7F_EventScript_Door2:: @ 81A8A39
 
 SilphCo_7F_EventScript_Door3:: @ 81A8A53
     lockall
-    setvar VAR_0x4001, 13
+    setvar VAR_TEMP_1, 13
     setvar VAR_0x8004, 646
     checkflag FLAG_SILPH_7F_DOOR_3
     goto_if TRUE, EventScript_DoorUnlocked
@@ -465,7 +465,7 @@ SilphCo_7F_EventScript_Door3:: @ 81A8A53
 
 SilphCo_8F_EventScript_Door:: @ 81A8A6D
     lockall
-    setvar VAR_0x4001, 14
+    setvar VAR_TEMP_1, 14
     setvar VAR_0x8004, 647
     checkflag FLAG_SILPH_8F_DOOR
     goto_if TRUE, EventScript_DoorUnlocked
@@ -474,7 +474,7 @@ SilphCo_8F_EventScript_Door:: @ 81A8A6D
 
 SilphCo_9F_EventScript_Door1:: @ 81A8A87
     lockall
-    setvar VAR_0x4001, 15
+    setvar VAR_TEMP_1, 15
     setvar VAR_0x8004, 648
     checkflag FLAG_SILPH_9F_DOOR_1
     goto_if TRUE, EventScript_DoorUnlocked
@@ -483,7 +483,7 @@ SilphCo_9F_EventScript_Door1:: @ 81A8A87
 
 SilphCo_9F_EventScript_Door2:: @ 81A8AA1
     lockall
-    setvar VAR_0x4001, 16
+    setvar VAR_TEMP_1, 16
     setvar VAR_0x8004, 649
     checkflag FLAG_SILPH_9F_DOOR_2
     goto_if TRUE, EventScript_DoorUnlocked
@@ -492,7 +492,7 @@ SilphCo_9F_EventScript_Door2:: @ 81A8AA1
 
 SilphCo_9F_EventScript_Door3:: @ 81A8ABB
     lockall
-    setvar VAR_0x4001, 17
+    setvar VAR_TEMP_1, 17
     setvar VAR_0x8004, 650
     checkflag FLAG_SILPH_9F_DOOR_3
     goto_if TRUE, EventScript_DoorUnlocked
@@ -501,7 +501,7 @@ SilphCo_9F_EventScript_Door3:: @ 81A8ABB
 
 SilphCo_9F_EventScript_Door4:: @ 81A8AD5
     lockall
-    setvar VAR_0x4001, 18
+    setvar VAR_TEMP_1, 18
     setvar VAR_0x8004, 651
     checkflag FLAG_SILPH_9F_DOOR_4
     goto_if TRUE, EventScript_DoorUnlocked
@@ -510,7 +510,7 @@ SilphCo_9F_EventScript_Door4:: @ 81A8AD5
 
 SilphCo_10F_EventScript_Door:: @ 81A8AEF
     lockall
-    setvar VAR_0x4001, 19
+    setvar VAR_TEMP_1, 19
     setvar VAR_0x8004, 652
     checkflag FLAG_SILPH_10F_DOOR
     goto_if TRUE, EventScript_DoorUnlocked
@@ -519,7 +519,7 @@ SilphCo_10F_EventScript_Door:: @ 81A8AEF
 
 SilphCo_11F_EventScript_Door:: @ 81A8B09
     lockall
-    setvar VAR_0x4001, 20
+    setvar VAR_TEMP_1, 20
     setvar VAR_0x8004, 653
     checkflag FLAG_SILPH_11F_DOOR
     goto_if TRUE, EventScript_DoorUnlocked
@@ -536,45 +536,45 @@ EventScript_OpenDoor:: @ 81A8B32
     playfanfare MUS_FANFA1
     msgbox Text_CardKeyOpenedDoor
     waitfanfare
-    compare VAR_0x4001, 1
+    compare VAR_TEMP_1, 1
     call_if eq, EventScript_Open2FDoor1
-    compare VAR_0x4001, 2
+    compare VAR_TEMP_1, 2
     call_if eq, EventScript_Open2FDoor2
-    compare VAR_0x4001, 3
+    compare VAR_TEMP_1, 3
     call_if eq, EventScript_Open3FDoor1
-    compare VAR_0x4001, 4
+    compare VAR_TEMP_1, 4
     call_if eq, EventScript_Open3FDoor2
-    compare VAR_0x4001, 5
+    compare VAR_TEMP_1, 5
     call_if eq, EventScript_Open4FDoor1
-    compare VAR_0x4001, 6
+    compare VAR_TEMP_1, 6
     call_if eq, EventScript_Open4FDoor2
-    compare VAR_0x4001, 7
+    compare VAR_TEMP_1, 7
     call_if eq, EventScript_Open5FDoor1
-    compare VAR_0x4001, 8
+    compare VAR_TEMP_1, 8
     call_if eq, EventScript_Open5FDoor2
-    compare VAR_0x4001, 9
+    compare VAR_TEMP_1, 9
     call_if eq, EventScript_Open5FDoor3
-    compare VAR_0x4001, 10
+    compare VAR_TEMP_1, 10
     call_if eq, EventScript_Open6FDoor
-    compare VAR_0x4001, 11
+    compare VAR_TEMP_1, 11
     call_if eq, EventScript_Open7FDoor1
-    compare VAR_0x4001, 12
+    compare VAR_TEMP_1, 12
     call_if eq, EventScript_Open7FDoor2
-    compare VAR_0x4001, 13
+    compare VAR_TEMP_1, 13
     call_if eq, EventScript_Open7FDoor3
-    compare VAR_0x4001, 14
+    compare VAR_TEMP_1, 14
     call_if eq, EventScript_Open8FDoor
-    compare VAR_0x4001, 15
+    compare VAR_TEMP_1, 15
     call_if eq, EventScript_Open9FDoor1
-    compare VAR_0x4001, 16
+    compare VAR_TEMP_1, 16
     call_if eq, EventScript_Open9FDoor2
-    compare VAR_0x4001, 17
+    compare VAR_TEMP_1, 17
     call_if eq, EventScript_Open9FDoor3
-    compare VAR_0x4001, 18
+    compare VAR_TEMP_1, 18
     call_if eq, EventScript_Open9FDoor4
-    compare VAR_0x4001, 19
+    compare VAR_TEMP_1, 19
     call_if eq, EventScript_Open10FDoor
-    compare VAR_0x4001, 20
+    compare VAR_TEMP_1, 20
     call_if eq, EventScript_Open11FDoor
     waitse
     playse SE_KI_GASYAN
diff --git a/data/scripts/trainer_tower.inc b/data/scripts/trainer_tower.inc
index c3b3cdc2e..ffec7d4c8 100644
--- a/data/scripts/trainer_tower.inc
+++ b/data/scripts/trainer_tower.inc
@@ -8,7 +8,7 @@ SevenIsland_TrainerTower_7F_MapScript1_1C4F54:: @ 81C4F54
 SevenIsland_TrainerTower_8F_MapScript1_1C4F54:: @ 81C4F54
 SevenIsland_TrainerTower_Elevator_MapScript1_1C4F54:: @ 81C4F54
 SevenIsland_TrainerTower_Roof_MapScript1_1C4F54:: @ 81C4F54
-	setvar VAR_0x4002, 0
+	setvar VAR_TEMP_2, 0
 	setvar VAR_0x8004, 10
 	special sub_815D9E8
 	end
@@ -31,15 +31,15 @@ SevenIsland_TrainerTower_8F_MapScript2_1C4F62:: @ 81C4F62
 	setflag FLAG_TEMP_3
 	setflag FLAG_TEMP_4
 	setflag FLAG_TEMP_5
-	setvar VAR_0x400E, 1
-	setvar VAR_0x400F, 1
+	setvar VAR_TEMP_E, 1
+	setvar VAR_TEMP_F, 1
 	end
 
 EventScript_1C4FA7:: @ 81C4FA7
 	setflag FLAG_TEMP_2
 	setflag FLAG_TEMP_4
 	setflag FLAG_TEMP_5
-	setvar VAR_0x400F, 1
+	setvar VAR_TEMP_F, 1
 	setobjectxyperm 3, 15, 13
 	setobjectmovementtype 3, 9
 	goto EventScript_1C5042
@@ -47,7 +47,7 @@ EventScript_1C4FA7:: @ 81C4FA7
 EventScript_1C4FC5:: @ 81C4FC5
 	setflag FLAG_TEMP_3
 	setflag FLAG_TEMP_4
-	setvar VAR_0x400E, 1
+	setvar VAR_TEMP_E, 1
 	setvar VAR_0x8004, 5
 	special sub_815D9E8
 	compare VAR_RESULT, 1
@@ -67,7 +67,7 @@ EventScript_1C4FFE:: @ 81C4FFE
 
 EventScript_1C5019:: @ 81C5019
 	setflag FLAG_TEMP_5
-	setvar VAR_0x400F, 1
+	setvar VAR_TEMP_F, 1
 	setobjectxyperm 2, 10, 10
 	setobjectmovementtype 2, 8
 	setobjectxyperm 3, 14, 13
@@ -88,17 +88,17 @@ SevenIsland_TrainerTower_7F_MapScript3_1C5046:: @ 81C5046
 SevenIsland_TrainerTower_8F_MapScript3_1C5046:: @ 81C5046
 SevenIsland_TrainerTower_Elevator_MapScript2_1C5046:: @ 81C5046
 SevenIsland_TrainerTower_Roof_MapScript2_1C5046:: @ 81C5046
-	map_script_2 VAR_0x4002, 0, EventScript_1C5050
+	map_script_2 VAR_TEMP_2, 0, EventScript_1C5050
 	.2byte 0
 
 EventScript_1C5050:: @ 81C5050
-	setvar VAR_0x4002, 1
+	setvar VAR_TEMP_2, 1
 	setvar VAR_0x8004, 5
 	special sub_815D9E8
 	compare VAR_RESULT, 0
 	goto_if eq, EventScript_1C5072
-	setvar VAR_0x400E, 1
-	setvar VAR_0x400F, 1
+	setvar VAR_TEMP_E, 1
+	setvar VAR_TEMP_F, 1
 EventScript_1C5072:
 	setvar VAR_0x8004, 18
 	special sub_815D9E8
@@ -124,7 +124,7 @@ EventScript_1C50C2:
 	waitmovement 0
 	applymovement 3, Movement_Delay48
 	waitmovement 0
-	setvar VAR_0x400E, 1
+	setvar VAR_TEMP_E, 1
 	applymovement 3, Movement_1C5541
 	waitmovement 0
 	setvar VAR_0x8004, 1
@@ -138,24 +138,24 @@ EventScript_1C50C2:
 EventScript_1C510D:: @ 81C510D
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 2
-	copyvar VAR_0x8006, VAR_0x4003
+	copyvar VAR_0x8006, VAR_TEMP_3
 	special sub_815D9E8
 	msgbox gStringVar4
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 2
-	addvar VAR_0x4003, 1
-	compare VAR_0x4003, 1
+	addvar VAR_TEMP_3, 1
+	compare VAR_TEMP_3, 1
 	goto_if eq, EventScript_1C5146
-	setvar VAR_0x4003, 0
+	setvar VAR_TEMP_3, 0
 EventScript_1C5146:
-	copyvar VAR_0x8006, VAR_0x4003
+	copyvar VAR_0x8006, VAR_TEMP_3
 	special sub_815D9E8
 	msgbox gStringVar4
 	closemessage
 	goto EventScript_1C5219
 
 EventScript_1C515C:: @ 81C515C
-	switch VAR_0x4001
+	switch VAR_TEMP_1
 	case 0, EventScript_1C5182
 	case 1, EventScript_1C51AD
 	case 2, EventScript_1C51D8
@@ -193,7 +193,7 @@ EventScript_1C51D8:: @ 81C51D8
 EventScript_1C51FE:
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 2
-	copyvar VAR_0x8006, VAR_0x4001
+	copyvar VAR_0x8006, VAR_TEMP_1
 	special sub_815D9E8
 	msgbox gStringVar4
 	closemessage
@@ -215,16 +215,16 @@ EventScript_1C524D:
 	case 1, EventScript_1C52BA
 	case 2, EventScript_1C5280
 EventScript_1C5280:
-	switch VAR_0x4001
+	switch VAR_TEMP_1
 	case 0, EventScript_1C52A6
 	case 1, EventScript_1C52B0
 	case 2, EventScript_1C52D0
 EventScript_1C52A6:
-	addvar VAR_0x4001, 1
+	addvar VAR_TEMP_1, 1
 	goto EventScript_1C515C
 
 EventScript_1C52B0:: @ 81C52B0
-	addvar VAR_0x4001, 1
+	addvar VAR_TEMP_1, 1
 	goto EventScript_1C515C
 
 EventScript_1C52BA:: @ 81C52BA
@@ -374,7 +374,7 @@ SevenIsland_TrainerTower_5F_EventScript_1C54B4:: @ 81C54B4
 SevenIsland_TrainerTower_7F_EventScript_1C54B4:: @ 81C54B4
 SevenIsland_TrainerTower_3F_EventScript_1C54B4:: @ 81C54B4
 SevenIsland_TrainerTower_1F_EventScript_1C54B4:: @ 81C54B4
-	setvar VAR_0x4003, 0
+	setvar VAR_TEMP_3, 0
 	setvar VAR_0x8004, 16
 	special sub_815D9E8
 	compare VAR_RESULT, 0
@@ -394,7 +394,7 @@ SevenIsland_TrainerTower_5F_EventScript_1C54EA:: @ 81C54EA
 SevenIsland_TrainerTower_7F_EventScript_1C54EA:: @ 81C54EA
 SevenIsland_TrainerTower_3F_EventScript_1C54EA:: @ 81C54EA
 SevenIsland_TrainerTower_1F_EventScript_1C54EA:: @ 81C54EA
-	setvar VAR_0x4003, 1
+	setvar VAR_TEMP_3, 1
 	setvar VAR_0x8004, 16
 	special sub_815D9E8
 	compare VAR_RESULT, 0
@@ -406,7 +406,7 @@ SevenIsland_TrainerTower_1F_EventScript_1C54EA:: @ 81C54EA
 	applymovement 5, Movement_Delay48
 EventScript_1C551B:
 	waitmovement 0
-	setvar VAR_0x400F, 1
+	setvar VAR_TEMP_F, 1
 	goto EventScript_1C508F
 
 EventScript_1C5528:: @ 81C5528