summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorPhlosioneer <mattmdrr2@gmail.com>2019-02-27 14:42:32 -0500
committerPhlosioneer <mattmdrr2@gmail.com>2019-02-27 14:42:32 -0500
commit4137dd7b0bd6dd661831856e4ca30b958d4beac9 (patch)
treeaffb29a89c68bdf0cfbd4593b2089828ceaa422a /data
parentc1348d22f3d85cbc7425e8498a023b9b525f7207 (diff)
Identify unused, never read, and never written vars
Diffstat (limited to 'data')
-rw-r--r--data/event_scripts.s2
-rw-r--r--data/maps/FarawayIsland_Interior/scripts.inc2
-rw-r--r--data/maps/MarineCave_End/scripts.inc4
-rw-r--r--data/maps/PetalburgCity_Gym/scripts.inc2
-rw-r--r--data/maps/Route105/scripts.inc4
-rw-r--r--data/maps/Route114/scripts.inc4
-rw-r--r--data/maps/Route115/scripts.inc4
-rw-r--r--data/maps/Route116/scripts.inc4
-rw-r--r--data/maps/Route118/scripts.inc4
-rw-r--r--data/maps/Route125/scripts.inc4
-rw-r--r--data/maps/Route127/scripts.inc4
-rw-r--r--data/maps/Route129/scripts.inc4
-rw-r--r--data/maps/TerraCave_End/scripts.inc4
13 files changed, 23 insertions, 23 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 19b4949eb..abc60dd18 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -3193,7 +3193,7 @@ UnusualWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31
call UnusualWeather_EventScript_CleanupMapTiles
special DrawWholeMapView
setvar VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE
- setvar VAR_0x4039, 0
+ setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 0
clearflag FLAG_SPECIAL_FLAG_0x4000
fadescreenswapbuffers 0
releaseall
diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc
index 7051d376c..bee33ae07 100644
--- a/data/maps/FarawayIsland_Interior/scripts.inc
+++ b/data/maps/FarawayIsland_Interior/scripts.inc
@@ -38,7 +38,7 @@ FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E
return
FarawayIsland_Interior_MapScript1_267D72: @ 8267D72
- setvar VAR_0x403A, 0
+ setvar VAR_NEVER_READ_0x403A, 0
setvar VAR_TEMP_1, 1
call_if_unset FLAG_CAUGHT_MEW, FarawayIsland_Interior_EventScript_267D86
end
diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc
index 036fa7724..028075648 100644
--- a/data/maps/MarineCave_End/scripts.inc
+++ b/data/maps/MarineCave_End/scripts.inc
@@ -47,13 +47,13 @@ MarineCave_End_EventScript_23B01B:: @ 823B01B
goto_if_eq MarineCave_End_EventScript_23B092
compare VAR_RESULT, 5
goto_if_eq MarineCave_End_EventScript_23B092
- setvar VAR_0x4039, 1
+ setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1
setflag FLAG_DEFEATED_KYOGRE
releaseall
end
MarineCave_End_EventScript_23B084:: @ 823B084
- setvar VAR_0x4039, 1
+ setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1
setflag FLAG_DEFEATED_KYOGRE
goto MarineCave_End_EventScript_27376D
end
diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc
index 1f0fdd91c..fef5c4048 100644
--- a/data/maps/PetalburgCity_Gym/scripts.inc
+++ b/data/maps/PetalburgCity_Gym/scripts.inc
@@ -60,7 +60,7 @@ PetalburgCity_Gym_EventScript_204955:: @ 8204955
return
PetalburgCity_Gym_EventScript_20495D:: @ 820495D
- setorcopyvar VAR_0x8015, 269
+ setorcopyvar VAR_NEVER_READ_0x8015, 269
specialvar VAR_RESULT, IsTrainerReadyForRematch
compare VAR_RESULT, 1
goto_if_eq PetalburgCity_Gym_EventScript_204985
diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc
index 1f4202ec4..2b8ebe305 100644
--- a/data/maps/Route105/scripts.inc
+++ b/data/maps/Route105/scripts.inc
@@ -18,7 +18,7 @@ Route105_EventScript_1EE20B:: @ 81EE20B
return
Route105_MapScript1_1EE21E: @ 81EE21E
- compare VAR_0x4039, 1
+ compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
call_if_eq Route105_EventScript_273D13
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH
call_if_eq UnusualWeather_StartKyogreWeather
@@ -27,7 +27,7 @@ Route105_MapScript1_1EE21E: @ 81EE21E
end
Route105_MapScript2_1EE240: @ 81EE240
- map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
+ map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
.2byte 0
Route105_EventScript_1EE24A:: @ 81EE24A
diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc
index 6a2f8b174..b03a2f228 100644
--- a/data/maps/Route114/scripts.inc
+++ b/data/maps/Route114/scripts.inc
@@ -5,7 +5,7 @@ Route114_MapScripts:: @ 81F252F
.byte 0
Route114_MapScript1_1F253F: @ 81F253F
- compare VAR_0x4039, 1
+ compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
call_if_eq Route114_EventScript_273D13
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH
call_if_eq UnusualWeather_StartGroudonWeather
@@ -21,7 +21,7 @@ Route114_MapScript1_1F2561: @ 81F2561
end
Route114_MapScript2_1F2578: @ 81F2578
- map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
+ map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
.2byte 0
Route114_EventScript_1F2582:: @ 81F2582
diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc
index be3a98f42..259cd5904 100644
--- a/data/maps/Route115/scripts.inc
+++ b/data/maps/Route115/scripts.inc
@@ -12,7 +12,7 @@ Route115_MapScript1_1F2930: @ 81F2930
end
Route115_MapScript1_1F2947: @ 81F2947
- compare VAR_0x4039, 1
+ compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
call_if_eq Route115_EventScript_273D13
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_WEST
call_if_eq UnusualWeather_StartGroudonWeather
@@ -21,7 +21,7 @@ Route115_MapScript1_1F2947: @ 81F2947
end
Route115_MapScript2_1F2969: @ 81F2969
- map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
+ map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
.2byte 0
Route115_EventScript_1F2973:: @ 81F2973
diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc
index 193b70157..454201307 100644
--- a/data/maps/Route116/scripts.inc
+++ b/data/maps/Route116/scripts.inc
@@ -6,7 +6,7 @@ Route116_MapScripts:: @ 81F2C0C
Route116_MapScript1_1F2C1C: @ 81F2C1C
call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_1F2C47
- compare VAR_0x4039, 1
+ compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
call_if_eq Route116_EventScript_273D13
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH
call_if_eq UnusualWeather_StartGroudonWeather
@@ -26,7 +26,7 @@ Route116_MapScript1_1F2C4F: @ 81F2C4F
end
Route116_MapScript2_1F2C66: @ 81F2C66
- map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
+ map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
.2byte 0
Route116_EventScript_1F2C70:: @ 81F2C70
diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc
index a2784b298..9c1ec46ca 100644
--- a/data/maps/Route118/scripts.inc
+++ b/data/maps/Route118/scripts.inc
@@ -6,7 +6,7 @@ Route118_MapScripts:: @ 81F3DBC
Route118_MapScript1_1F3DCC: @ 81F3DCC
call Route118_EventScript_28CCC7
- compare VAR_0x4039, 1
+ compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
call_if_eq Route118_EventScript_273D13
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST
call_if_eq UnusualWeather_StartGroudonWeather
@@ -22,7 +22,7 @@ Route118_MapScript1_1F3DF3: @ 81F3DF3
end
Route118_MapScript2_1F3E0A: @ 81F3E0A
- map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
+ map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
.2byte 0
Route118_EventScript_1F3E14:: @ 81F3E14
diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc
index a2e9f1d40..8abcbe787 100644
--- a/data/maps/Route125/scripts.inc
+++ b/data/maps/Route125/scripts.inc
@@ -6,7 +6,7 @@ Route125_MapScripts:: @ 81F6748
Route125_MapScript1_1F6758: @ 81F6758
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
- compare VAR_0x4039, 1
+ compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
call_if_eq Route125_EventScript_273D13
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_WEST
call_if_eq UnusualWeather_StartKyogreWeather
@@ -22,7 +22,7 @@ Route125_MapScript1_1F6783: @ 81F6783
end
Route125_MapScript2_1F679A: @ 81F679A
- map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
+ map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
.2byte 0
Route125_EventScript_1F67A4:: @ 81F67A4
diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc
index 27b17d340..91fab2b61 100644
--- a/data/maps/Route127/scripts.inc
+++ b/data/maps/Route127/scripts.inc
@@ -6,7 +6,7 @@ Route127_MapScripts:: @ 81F69D9
Route127_MapScript1_1F69E9: @ 81F69E9
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
- compare VAR_0x4039, 1
+ compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
call_if_eq Route127_EventScript_273D13
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_NORTH
call_if_eq UnusualWeather_StartKyogreWeather
@@ -22,7 +22,7 @@ Route127_MapScript1_1F6A14: @ 81F6A14
end
Route127_MapScript2_1F6A2B: @ 81F6A2B
- map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
+ map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
.2byte 0
Route127_EventScript_1F6A35:: @ 81F6A35
diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc
index 3fc30cf91..0cd5f838a 100644
--- a/data/maps/Route129/scripts.inc
+++ b/data/maps/Route129/scripts.inc
@@ -12,7 +12,7 @@ Route129_MapScript1_1F7294: @ 81F7294
end
Route129_MapScript1_1F72AB: @ 81F72AB
- compare VAR_0x4039, 1
+ compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
call_if_eq Route129_EventScript_273D13
compare VAR_0x405E, 4
call_if_ge Route129_EventScript_1F72D8
@@ -27,7 +27,7 @@ Route129_EventScript_1F72D8:: @ 81F72D8
return
Route129_MapScript2_1F72E2: @ 81F72E2
- map_script_2 VAR_0x4039, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
+ map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
.2byte 0
Route129_EventScript_1F72EC:: @ 81F72EC
diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc
index 3f892315d..b5a664a76 100644
--- a/data/maps/TerraCave_End/scripts.inc
+++ b/data/maps/TerraCave_End/scripts.inc
@@ -47,13 +47,13 @@ TerraCave_End_EventScript_23B0EC:: @ 823B0EC
goto_if_eq TerraCave_End_EventScript_23B163
compare VAR_RESULT, 5
goto_if_eq TerraCave_End_EventScript_23B163
- setvar VAR_0x4039, 1
+ setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1
setflag FLAG_DEFEATED_GROUDON
releaseall
end
TerraCave_End_EventScript_23B155:: @ 823B155
- setvar VAR_0x4039, 1
+ setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 1
setflag FLAG_DEFEATED_GROUDON
goto TerraCave_End_EventScript_27376D
end
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-23 21:10:13 +0000