summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/event_scripts.s2
-rw-r--r--data/maps/DewfordTown_Gym/scripts.inc2
-rw-r--r--data/maps/FortreeCity_Gym/scripts.inc2
-rw-r--r--data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc2
-rw-r--r--data/maps/MauvilleCity/scripts.inc2
-rw-r--r--data/maps/Route124/map.json2
-rw-r--r--data/maps/Route125/map.json2
-rw-r--r--data/maps/Route126/map.json2
-rw-r--r--data/maps/Route127/map.json2
-rw-r--r--data/maps/Route128/map.json2
-rw-r--r--data/maps/Route129/map.json2
-rw-r--r--data/maps/Route130/map.json2
-rw-r--r--data/maps/Route131/map.json2
-rw-r--r--data/maps/Route132/map.json2
-rw-r--r--data/maps/Route133/map.json2
-rw-r--r--data/maps/Route134/map.json2
-rw-r--r--data/maps/SeafloorCavern_Entrance/scripts.inc4
-rw-r--r--data/maps/SkyPillar_Top/map.json2
-rw-r--r--data/maps/SkyPillar_Top/scripts.inc2
-rw-r--r--data/maps/SootopolisCity/scripts.inc10
20 files changed, 25 insertions, 25 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 364aae31c..d2828d5ea 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -48,7 +48,7 @@ gSpecialVars:: @ 81DBA0C
.4byte gSpecialVar_ContestCategory
.4byte gSpecialVar_MonBoxId
.4byte gSpecialVar_MonBoxPos
- .4byte gSpecialVar_0x8014
+ .4byte gSpecialVar_Unused_0x8014
.4byte gTrainerBattleOpponent_A
.include "data/specials.inc"
diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc
index 3b39fc5d0..eb8183585 100644
--- a/data/maps/DewfordTown_Gym/scripts.inc
+++ b/data/maps/DewfordTown_Gym/scripts.inc
@@ -187,7 +187,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7
closemessage
delay 30
setflag FLAG_ENABLE_BRAWLY_MATCH_CALL
- setvar VAR_0x40F4, 0
+ setvar VAR_ROXANNE_CALL_STEP_COUNTER, 0
setflag FLAG_ENABLE_ROXANNE_FIRST_CALL
release
end
diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc
index 30cf8736a..8192e2039 100644
--- a/data/maps/FortreeCity_Gym/scripts.inc
+++ b/data/maps/FortreeCity_Gym/scripts.inc
@@ -43,7 +43,7 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD
closemessage
delay 30
setflag FLAG_ENABLE_WINONA_MATCH_CALL
- setvar VAR_0x40F3, 0
+ setvar VAR_WINONA_CALL_STEP_COUNTER, 0
setflag FLAG_REGISTER_WINONA_POKENAV
release
end
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
index 51ace147d..c02381982 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
@@ -195,7 +195,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80
setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH
setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL
setvar VAR_0x40D3, 2
- setvar VAR_0x40F5, 0
+ setvar VAR_SCOTT_CALL_STEP_COUNTER, 0
setflag FLAG_SCOTT_CALL_NATIONAL_DEX
releaseall
end
diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc
index 62c2219ea..61839d108 100644
--- a/data/maps/MauvilleCity/scripts.inc
+++ b/data/maps/MauvilleCity/scripts.inc
@@ -158,7 +158,7 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593
clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY
clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE
setflag FLAG_DEFEATED_WALLY_MAUVILLE
- setvar VAR_0x40F2, 0
+ setvar VAR_WALLY_CALL_STEP_COUNTER, 0
setflag FLAG_ENABLE_FIRST_WALLY_POKENAV_CALL
compare VAR_FACING, 2
call_if_eq MauvilleCity_EventScript_1DF5F3
diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json
index 7169a0299..c1a22a2d0 100644
--- a/data/maps/Route124/map.json
+++ b/data/maps/Route124/map.json
@@ -6,7 +6,7 @@
"region_map_section": "MAPSEC_ROUTE_124",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
- "map_type": "MAP_TYPE_6",
+ "map_type": "MAP_TYPE_OCEAN_ROUTE",
"allow_bike": true,
"allow_escape_rope": false,
"allow_running": true,
diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json
index 8071cf244..0ce520fdd 100644
--- a/data/maps/Route125/map.json
+++ b/data/maps/Route125/map.json
@@ -6,7 +6,7 @@
"region_map_section": "MAPSEC_ROUTE_125",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
- "map_type": "MAP_TYPE_6",
+ "map_type": "MAP_TYPE_OCEAN_ROUTE",
"allow_bike": true,
"allow_escape_rope": false,
"allow_running": true,
diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json
index 1e886a083..ea63eb80d 100644
--- a/data/maps/Route126/map.json
+++ b/data/maps/Route126/map.json
@@ -6,7 +6,7 @@
"region_map_section": "MAPSEC_ROUTE_126",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
- "map_type": "MAP_TYPE_6",
+ "map_type": "MAP_TYPE_OCEAN_ROUTE",
"allow_bike": true,
"allow_escape_rope": false,
"allow_running": true,
diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json
index 1b30f7d55..e4a68c3e1 100644
--- a/data/maps/Route127/map.json
+++ b/data/maps/Route127/map.json
@@ -6,7 +6,7 @@
"region_map_section": "MAPSEC_ROUTE_127",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
- "map_type": "MAP_TYPE_6",
+ "map_type": "MAP_TYPE_OCEAN_ROUTE",
"allow_bike": true,
"allow_escape_rope": false,
"allow_running": true,
diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json
index 826290ff3..58246c247 100644
--- a/data/maps/Route128/map.json
+++ b/data/maps/Route128/map.json
@@ -6,7 +6,7 @@
"region_map_section": "MAPSEC_ROUTE_128",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
- "map_type": "MAP_TYPE_6",
+ "map_type": "MAP_TYPE_OCEAN_ROUTE",
"allow_bike": true,
"allow_escape_rope": false,
"allow_running": true,
diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json
index b3e45b227..3183f9821 100644
--- a/data/maps/Route129/map.json
+++ b/data/maps/Route129/map.json
@@ -6,7 +6,7 @@
"region_map_section": "MAPSEC_ROUTE_129",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
- "map_type": "MAP_TYPE_6",
+ "map_type": "MAP_TYPE_OCEAN_ROUTE",
"allow_bike": true,
"allow_escape_rope": false,
"allow_running": true,
diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json
index 0a68d442c..18d168b17 100644
--- a/data/maps/Route130/map.json
+++ b/data/maps/Route130/map.json
@@ -6,7 +6,7 @@
"region_map_section": "MAPSEC_ROUTE_130",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
- "map_type": "MAP_TYPE_6",
+ "map_type": "MAP_TYPE_OCEAN_ROUTE",
"allow_bike": true,
"allow_escape_rope": false,
"allow_running": true,
diff --git a/data/maps/Route131/map.json b/data/maps/Route131/map.json
index 3a48042f9..379b15b3d 100644
--- a/data/maps/Route131/map.json
+++ b/data/maps/Route131/map.json
@@ -6,7 +6,7 @@
"region_map_section": "MAPSEC_ROUTE_131",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
- "map_type": "MAP_TYPE_6",
+ "map_type": "MAP_TYPE_OCEAN_ROUTE",
"allow_bike": true,
"allow_escape_rope": false,
"allow_running": true,
diff --git a/data/maps/Route132/map.json b/data/maps/Route132/map.json
index ae04ff62d..15c0de83d 100644
--- a/data/maps/Route132/map.json
+++ b/data/maps/Route132/map.json
@@ -6,7 +6,7 @@
"region_map_section": "MAPSEC_ROUTE_132",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
- "map_type": "MAP_TYPE_6",
+ "map_type": "MAP_TYPE_OCEAN_ROUTE",
"allow_bike": true,
"allow_escape_rope": false,
"allow_running": true,
diff --git a/data/maps/Route133/map.json b/data/maps/Route133/map.json
index 2a8941e12..eed30d7ee 100644
--- a/data/maps/Route133/map.json
+++ b/data/maps/Route133/map.json
@@ -6,7 +6,7 @@
"region_map_section": "MAPSEC_ROUTE_133",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
- "map_type": "MAP_TYPE_6",
+ "map_type": "MAP_TYPE_OCEAN_ROUTE",
"allow_bike": true,
"allow_escape_rope": false,
"allow_running": true,
diff --git a/data/maps/Route134/map.json b/data/maps/Route134/map.json
index 1e9123efe..8b3a9518e 100644
--- a/data/maps/Route134/map.json
+++ b/data/maps/Route134/map.json
@@ -6,7 +6,7 @@
"region_map_section": "MAPSEC_ROUTE_134",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
- "map_type": "MAP_TYPE_6",
+ "map_type": "MAP_TYPE_OCEAN_ROUTE",
"allow_bike": true,
"allow_escape_rope": false,
"allow_running": true,
diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc
index 045c0e065..1bf570549 100644
--- a/data/maps/SeafloorCavern_Entrance/scripts.inc
+++ b/data/maps/SeafloorCavern_Entrance/scripts.inc
@@ -9,7 +9,7 @@ SeafloorCavern_Entrance_MapScript1_234474: @ 8234474
SeafloorCavern_Entrance_EventScript_234485:: @ 8234485
lockall
- compare VAR_0x40D9, 1
+ compare VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, 1
goto_if_eq SeafloorCavern_Entrance_EventScript_2344ED
waitse
playse SE_PIN
@@ -25,7 +25,7 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485
compare VAR_FACING, 2
call_if_eq SeafloorCavern_Entrance_EventScript_234539
delay 30
- setvar VAR_0x40D9, 1
+ setvar VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, 1
moveobjectoffscreen 1
msgbox SeafloorCavern_Entrance_Text_234544, MSGBOX_DEFAULT
closemessage
diff --git a/data/maps/SkyPillar_Top/map.json b/data/maps/SkyPillar_Top/map.json
index 5cb6a1a69..2d1a6fa1a 100644
--- a/data/maps/SkyPillar_Top/map.json
+++ b/data/maps/SkyPillar_Top/map.json
@@ -56,7 +56,7 @@
"x": 14,
"y": 9,
"elevation": 3,
- "var": "VAR_0x40D7",
+ "var": "VAR_SKY_PILLAR_RAQUAZA_CRY_DONE",
"var_value": "0",
"script": "SkyPillar_Top_EventScript_23979A"
}
diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc
index 5a69001a1..d08b0b554 100644
--- a/data/maps/SkyPillar_Top/scripts.inc
+++ b/data/maps/SkyPillar_Top/scripts.inc
@@ -132,7 +132,7 @@ SkyPillar_Top_EventScript_23979A:: @ 823979A
special RemoveCameraObject
setvar VAR_RAYQUAZA_STATE, 5
setvar VAR_SKY_PILLAR_STATE, 1
- setvar VAR_0x40D7, 1
+ setvar VAR_SKY_PILLAR_RAQUAZA_CRY_DONE, 1
releaseall
end
diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc
index 9b5524a36..dbfe923f0 100644
--- a/data/maps/SootopolisCity/scripts.inc
+++ b/data/maps/SootopolisCity/scripts.inc
@@ -140,11 +140,11 @@ SootopolisCity_EventScript_1E5871:: @ 81E5871
setobjectxyperm 7, 29, 33
setobjectxyperm 16, 33, 35
setobjectxyperm 17, 34, 35
- compare VAR_0x40D8, 0
+ compare VAR_SOOTOPOLIS_STATE, 0
call_if_eq SootopolisCity_EventScript_1E58AF
- compare VAR_0x40D8, 1
+ compare VAR_SOOTOPOLIS_STATE, 1
call_if_eq SootopolisCity_EventScript_1E58BB
- compare VAR_0x40D8, 2
+ compare VAR_SOOTOPOLIS_STATE, 2
call_if_eq SootopolisCity_EventScript_1E58C7
return
@@ -1367,14 +1367,14 @@ SootopolisCity_EventScript_1E64B2:: @ 81E64B2
applymovement 18, SootopolisCity_Movement_1E64EC
waitmovement 0
moveobjectoffscreen 18
- setvar VAR_0x40D8, 1
+ setvar VAR_SOOTOPOLIS_STATE, 1
return
SootopolisCity_EventScript_1E64C5:: @ 81E64C5
applymovement 18, SootopolisCity_Movement_1E64EF
waitmovement 0
moveobjectoffscreen 18
- setvar VAR_0x40D8, 2
+ setvar VAR_SOOTOPOLIS_STATE, 2
return
SootopolisCity_EventScript_1E64D8:: @ 81E64D8
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-23 13:46:13 +0000