summaryrefslogtreecommitdiff
path: root/data/maps
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps')
-rw-r--r--data/maps/CeruleanCity_BikeShop/scripts.inc6
-rw-r--r--data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc12
-rw-r--r--data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc8
-rw-r--r--data/maps/FuchsiaCity/scripts.inc6
-rw-r--r--data/maps/MtMoon_B2F/scripts.inc4
-rw-r--r--data/maps/Route16_NorthEntrance_1F/scripts.inc2
-rw-r--r--data/maps/Route18_EastEntrance_1F/scripts.inc2
-rw-r--r--data/maps/SaffronCity_Dojo/scripts.inc10
-rw-r--r--data/maps/SilphCo_10F/scripts.inc2
-rw-r--r--data/maps/SilphCo_11F/scripts.inc2
-rw-r--r--data/maps/SilphCo_2F/scripts.inc4
-rw-r--r--data/maps/SilphCo_3F/scripts.inc4
-rw-r--r--data/maps/SilphCo_4F/scripts.inc4
-rw-r--r--data/maps/SilphCo_5F/scripts.inc6
-rw-r--r--data/maps/SilphCo_6F/scripts.inc2
-rw-r--r--data/maps/SilphCo_7F/scripts.inc6
-rw-r--r--data/maps/SilphCo_8F/scripts.inc2
-rw-r--r--data/maps/SilphCo_9F/scripts.inc8
18 files changed, 45 insertions, 45 deletions
diff --git a/data/maps/CeruleanCity_BikeShop/scripts.inc b/data/maps/CeruleanCity_BikeShop/scripts.inc
index d25df2e87..1091e75cb 100644
--- a/data/maps/CeruleanCity_BikeShop/scripts.inc
+++ b/data/maps/CeruleanCity_BikeShop/scripts.inc
@@ -4,7 +4,7 @@ CeruleanCity_BikeShop_MapScripts:: @ 816ABBC
CeruleanCity_BikeShop_EventScript_16ABBD:: @ 816ABBD
lock
faceplayer
- checkflag FLAG_0x271
+ checkflag FLAG_GOT_BICYCLE
goto_if TRUE, EventScript_16AC58
checkflag FLAG_GOT_BIKE_VOUCHER
goto_if TRUE, EventScript_16AC22
@@ -34,7 +34,7 @@ EventScript_16AC15:: @ 816AC15
EventScript_16AC22:: @ 816AC22
msgbox gUnknown_81927B2
giveitemfanfaremsg gUnknown_81927E1, ITEM_BICYCLE, 1, MUS_FAN5
- setflag FLAG_0x271
+ setflag FLAG_GOT_BICYCLE
additem ITEM_BICYCLE, 1
removeitem ITEM_BIKE_VOUCHER, 1
msgbox gUnknown_819280E
@@ -58,7 +58,7 @@ CeruleanCity_BikeShop_EventScript_16AC6C:: @ 816AC6C
CeruleanCity_BikeShop_EventScript_16AC75:: @ 816AC75
lock
faceplayer
- checkflag FLAG_0x271
+ checkflag FLAG_GOT_BICYCLE
goto_if TRUE, EventScript_16AC8A
msgbox gUnknown_8192937
release
diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc
index 7c5a98a96..ad8b416cd 100644
--- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc
+++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc
@@ -6,7 +6,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401
faceplayer
setvar VAR_0x8008, 8
call EventScript_1A8CAD
- checkflag FLAG_0x276
+ checkflag FLAG_DID_SEELOR_TRADE
goto_if TRUE, EventScript_16E473
msgbox gUnknown_81A597B, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
@@ -19,7 +19,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401
goto_if ne, EventScript_16E465
call EventScript_1A8CD9
msgbox gUnknown_81A59DA
- setflag FLAG_0x276
+ setflag FLAG_DID_SEELOR_TRADE
release
end
@@ -65,7 +65,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D:: @ 816E47D
end
EventScript_16E4EC:: @ 816E4EC
- checkflag FLAG_0x273
+ checkflag FLAG_GOT_HELIX_FOSSIL
goto_if FALSE, EventScript_16E534
checkflag FLAG_REVIVED_HELIX
goto_if TRUE, EventScript_16E534
@@ -73,7 +73,7 @@ EventScript_16E4EC:: @ 816E4EC
return
EventScript_16E504:: @ 816E504
- checkflag FLAG_0x272
+ checkflag FLAG_GOT_DOME_FOSSIL
goto_if FALSE, EventScript_16E534
checkflag FLAG_REVIVED_DOME
goto_if TRUE, EventScript_16E534
@@ -301,9 +301,9 @@ EventScript_16E897:: @ 816E897
end
EventScript_16E8A1:: @ 816E8A1
- checkflag FLAG_0x273
+ checkflag FLAG_GOT_HELIX_FOSSIL
goto_if TRUE, EventScript_16E8B9
- checkflag FLAG_0x272
+ checkflag FLAG_GOT_DOME_FOSSIL
goto_if TRUE, EventScript_16E8C8
goto EventScript_16E534
end
diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc
index a64105c74..ad0fce530 100644
--- a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc
+++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc
@@ -10,7 +10,7 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2
faceplayer
setvar VAR_0x8008, 6
call EventScript_1A8CAD
- checkflag FLAG_0x274
+ checkflag FLAG_DID_ESPHERE_TRADE
goto_if TRUE, EventScript_16E334
msgbox gUnknown_81A59FE, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
@@ -23,7 +23,7 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2
goto_if ne, EventScript_16E326
call EventScript_1A8CD9
msgbox gUnknown_81A5A9D
- setflag FLAG_0x274
+ setflag FLAG_DID_ESPHERE_TRADE
release
end
@@ -50,7 +50,7 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E
copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, sub_8053A9C
copyvar VAR_0x8009, VAR_RESULT
- checkflag FLAG_0x275
+ checkflag FLAG_DID_TANGENY_TRADE
goto_if TRUE, EventScript_16E3D4
msgbox gUnknown_81A5AD6, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
@@ -71,7 +71,7 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E
special sub_8054440
waitstate
msgbox gUnknown_81A5B4A
- setflag FLAG_0x275
+ setflag FLAG_DID_TANGENY_TRADE
release
end
diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc
index cfc60a4be..d62d5252d 100644
--- a/data/maps/FuchsiaCity/scripts.inc
+++ b/data/maps/FuchsiaCity/scripts.inc
@@ -4,9 +4,9 @@ FuchsiaCity_MapScripts:: @ 8166D75
FuchsiaCity_MapScript1_166D7B:: @ 8166D7B
setworldmapflag FLAG_WORLD_MAP_FUCHSIA_CITY
- checkflag FLAG_0x272
+ checkflag FLAG_GOT_DOME_FOSSIL
call_if TRUE, EventScript_166D91
- checkflag FLAG_0x272
+ checkflag FLAG_GOT_DOME_FOSSIL
call_if FALSE, EventScript_166D97
end
@@ -121,7 +121,7 @@ FuchsiaCity_EventScript_166E83:: @ 8166E83
FuchsiaCity_EventScript_166E9C:: @ 8166E9C
lockall
- checkflag FLAG_0x272
+ checkflag FLAG_GOT_DOME_FOSSIL
goto_if TRUE, EventScript_166EBE
setvar VAR_0x8004, SPECIES_KABUTO
special sub_80CBDCC
diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc
index d1c352d9a..caf90c005 100644
--- a/data/maps/MtMoon_B2F/scripts.inc
+++ b/data/maps/MtMoon_B2F/scripts.inc
@@ -74,7 +74,7 @@ MtMoon_B2F_EventScript_16071B:: @ 816071B
waitmessage
waitfanfare
removeobject 2
- setflag FLAG_0x272
+ setflag FLAG_GOT_DOME_FOSSIL
setflag FLAG_GOT_FOSSIL_FROM_MT_MOON
release
end
@@ -107,7 +107,7 @@ MtMoon_B2F_EventScript_16077F:: @ 816077F
waitmessage
waitfanfare
removeobject 1
- setflag FLAG_0x273
+ setflag FLAG_GOT_HELIX_FOSSIL
setflag FLAG_GOT_FOSSIL_FROM_MT_MOON
release
end
diff --git a/data/maps/Route16_NorthEntrance_1F/scripts.inc b/data/maps/Route16_NorthEntrance_1F/scripts.inc
index 3eecb6f1d..d96ae482f 100644
--- a/data/maps/Route16_NorthEntrance_1F/scripts.inc
+++ b/data/maps/Route16_NorthEntrance_1F/scripts.inc
@@ -4,7 +4,7 @@ Route16_NorthEntrance_1F_MapScripts:: @ 81701C2
Route16_NorthEntrance_1F_MapScript1_1701C8:: @ 81701C8
clearflag FLAG_0x830
- checkflag FLAG_0x271
+ checkflag FLAG_GOT_BICYCLE
call_if TRUE, EventScript_1701D5
end
diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc
index 411dfd216..e0996a8b8 100644
--- a/data/maps/Route18_EastEntrance_1F/scripts.inc
+++ b/data/maps/Route18_EastEntrance_1F/scripts.inc
@@ -4,7 +4,7 @@ Route18_EastEntrance_1F_MapScripts:: @ 8170378
Route18_EastEntrance_1F_MapScript1_17037E:: @ 817037E
clearflag FLAG_0x830
- checkflag FLAG_0x271
+ checkflag FLAG_GOT_BICYCLE
call_if TRUE, EventScript_17038B
end
diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc
index e0991b9d5..9c0f5cba8 100644
--- a/data/maps/SaffronCity_Dojo/scripts.inc
+++ b/data/maps/SaffronCity_Dojo/scripts.inc
@@ -20,7 +20,7 @@ SaffronCity_Dojo_EventScript_16EBEE:: @ 816EBEE
SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00
lock
faceplayer
- checkflag FLAG_0x278
+ checkflag FLAG_GOT_HITMON_FROM_DOJO
goto_if TRUE, EventScript_16EC3C
drawmonpic SPECIES_HITMONLEE, 10, 3
setvar VAR_0x4001, SPECIES_HITMONLEE
@@ -43,7 +43,7 @@ EventScript_16EC3C:: @ 816EC3C
SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46
lock
faceplayer
- checkflag FLAG_0x278
+ checkflag FLAG_GOT_HITMON_FROM_DOJO
goto_if TRUE, EventScript_16EC3C
drawmonpic SPECIES_HITMONCHAN, 10, 3
setvar VAR_0x4001, SPECIES_HITMONCHAN
@@ -77,7 +77,7 @@ EventScript_16ECB5:: @ 816ECB5
message Text_19B473
waitmessage
waitfanfare
- setflag FLAG_0x278
+ setflag FLAG_GOT_HITMON_FROM_DOJO
msgbox gUnknown_81A56A7, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_16ED29
@@ -93,7 +93,7 @@ EventScript_16ECEC:: @ 816ECEC
message Text_19B473
waitmessage
waitfanfare
- setflag FLAG_0x278
+ setflag FLAG_GOT_HITMON_FROM_DOJO
msgbox gUnknown_81A56A7, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_16ED1E
@@ -144,7 +144,7 @@ SaffronCity_Dojo_EventScript_16ED8B:: @ 816ED8B
SaffronCity_Dojo_EventScript_16EDA2:: @ 816EDA2
trainerbattle 2, TRAINER_BLACK_BELT_KOICHI, 0, Text_19B12C, Text_19B193, EventScript_16EDD0
- checkflag FLAG_0x278
+ checkflag FLAG_GOT_HITMON_FROM_DOJO
goto_if TRUE, EventScript_16EDC6
msgbox gUnknown_819B1A7, 6
end
diff --git a/data/maps/SilphCo_10F/scripts.inc b/data/maps/SilphCo_10F/scripts.inc
index f453463dd..58f28c644 100644
--- a/data/maps/SilphCo_10F/scripts.inc
+++ b/data/maps/SilphCo_10F/scripts.inc
@@ -3,7 +3,7 @@ SilphCo_10F_MapScripts:: @ 8161D86
.byte 0
SilphCo_10F_MapScript1_161D8C:: @ 8161D8C
- checkflag FLAG_0x28C
+ checkflag FLAG_SILPH_10F_DOOR
call_if FALSE, EventScript_1A84D6
end
diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc
index 850cd3ce5..d418848ea 100644
--- a/data/maps/SilphCo_11F/scripts.inc
+++ b/data/maps/SilphCo_11F/scripts.inc
@@ -3,7 +3,7 @@ SilphCo_11F_MapScripts:: @ 8161DEE
.byte 0
SilphCo_11F_MapScript1_161DF4:: @ 8161DF4
- checkflag FLAG_0x28D
+ checkflag FLAG_SILPH_11F_DOOR
call_if FALSE, EventScript_1A8504
end
diff --git a/data/maps/SilphCo_2F/scripts.inc b/data/maps/SilphCo_2F/scripts.inc
index d2848d23d..e0ca5906b 100644
--- a/data/maps/SilphCo_2F/scripts.inc
+++ b/data/maps/SilphCo_2F/scripts.inc
@@ -3,9 +3,9 @@ SilphCo_2F_MapScripts:: @ 8161641
.byte 0
SilphCo_2F_MapScript1_161647:: @ 8161647
- checkflag FLAG_0x27A
+ checkflag FLAG_SILPH_2F_DOOR_1
call_if FALSE, EventScript_1A8149
- checkflag FLAG_0x27B
+ checkflag FLAG_SILPH_2F_DOOR_2
call_if FALSE, EventScript_1A8177
end
diff --git a/data/maps/SilphCo_3F/scripts.inc b/data/maps/SilphCo_3F/scripts.inc
index ee4a4288b..0ef319f8c 100644
--- a/data/maps/SilphCo_3F/scripts.inc
+++ b/data/maps/SilphCo_3F/scripts.inc
@@ -3,9 +3,9 @@ SilphCo_3F_MapScripts:: @ 81616C5
.byte 0
SilphCo_3F_MapScript1_1616CB:: @ 81616CB
- checkflag FLAG_0x27C
+ checkflag FLAG_SILPH_3F_DOOR_1
call_if FALSE, EventScript_1A81A5
- checkflag FLAG_0x27D
+ checkflag FLAG_SILPH_3F_DOOR_2
call_if FALSE, EventScript_1A81DC
end
diff --git a/data/maps/SilphCo_4F/scripts.inc b/data/maps/SilphCo_4F/scripts.inc
index 62f122892..f2fadd471 100644
--- a/data/maps/SilphCo_4F/scripts.inc
+++ b/data/maps/SilphCo_4F/scripts.inc
@@ -3,9 +3,9 @@ SilphCo_4F_MapScripts:: @ 8161736
.byte 0
SilphCo_4F_MapScript1_16173C:: @ 816173C
- checkflag FLAG_0x27E
+ checkflag FLAG_SILPH_4F_DOOR_1
call_if FALSE, EventScript_1A8213
- checkflag FLAG_0x27F
+ checkflag FLAG_SILPH_4F_DOOR_2
call_if FALSE, EventScript_1A8241
end
diff --git a/data/maps/SilphCo_5F/scripts.inc b/data/maps/SilphCo_5F/scripts.inc
index d97f831a6..6630007c5 100644
--- a/data/maps/SilphCo_5F/scripts.inc
+++ b/data/maps/SilphCo_5F/scripts.inc
@@ -3,11 +3,11 @@ SilphCo_5F_MapScripts:: @ 81617BE
.byte 0
SilphCo_5F_MapScript1_1617C4:: @ 81617C4
- checkflag FLAG_0x280
+ checkflag FLAG_SILPH_5F_DOOR_1
call_if FALSE, EventScript_1A826F
- checkflag FLAG_0x281
+ checkflag FLAG_SILPH_5F_DOOR_2
call_if FALSE, EventScript_1A82A6
- checkflag FLAG_0x282
+ checkflag FLAG_SILPH_5F_DOOR_3
call_if FALSE, EventScript_1A82DD
end
diff --git a/data/maps/SilphCo_6F/scripts.inc b/data/maps/SilphCo_6F/scripts.inc
index 2529bccd7..2ac42a2b3 100644
--- a/data/maps/SilphCo_6F/scripts.inc
+++ b/data/maps/SilphCo_6F/scripts.inc
@@ -3,7 +3,7 @@ SilphCo_6F_MapScripts:: @ 8161881
.byte 0
SilphCo_6F_MapScript1_161887:: @ 8161887
- checkflag FLAG_0x283
+ checkflag FLAG_SILPH_6F_DOOR
call_if FALSE, EventScript_1A8314
end
diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc
index 9d0137cc3..c4f6bafab 100644
--- a/data/maps/SilphCo_7F/scripts.inc
+++ b/data/maps/SilphCo_7F/scripts.inc
@@ -4,11 +4,11 @@ SilphCo_7F_MapScripts:: @ 8161984
.byte 0
SilphCo_7F_MapScript1_16198F:: @ 816198F
- checkflag FLAG_0x284
+ checkflag FLAG_SILPH_7F_DOOR_1
call_if FALSE, EventScript_1A834B
- checkflag FLAG_0x285
+ checkflag FLAG_SILPH_7F_DOOR_2
call_if FALSE, EventScript_1A8379
- checkflag FLAG_0x286
+ checkflag FLAG_SILPH_7F_DOOR_3
call_if FALSE, EventScript_1A83A7
end
diff --git a/data/maps/SilphCo_8F/scripts.inc b/data/maps/SilphCo_8F/scripts.inc
index 0bfacced0..70bc954cc 100644
--- a/data/maps/SilphCo_8F/scripts.inc
+++ b/data/maps/SilphCo_8F/scripts.inc
@@ -3,7 +3,7 @@ SilphCo_8F_MapScripts:: @ 8161C5F
.byte 0
SilphCo_8F_MapScript1_161C65:: @ 8161C65
- checkflag FLAG_0x287
+ checkflag FLAG_SILPH_8F_DOOR
call_if FALSE, EventScript_1A83D5
end
diff --git a/data/maps/SilphCo_9F/scripts.inc b/data/maps/SilphCo_9F/scripts.inc
index 36d9be32c..7f3535f60 100644
--- a/data/maps/SilphCo_9F/scripts.inc
+++ b/data/maps/SilphCo_9F/scripts.inc
@@ -3,13 +3,13 @@ SilphCo_9F_MapScripts:: @ 8161CDE
.byte 0
SilphCo_9F_MapScript1_161CE4:: @ 8161CE4
- checkflag FLAG_0x288
+ checkflag FLAG_SILPH_9F_DOOR_1
call_if FALSE, EventScript_1A840C
- checkflag FLAG_0x289
+ checkflag FLAG_SILPH_9F_DOOR_2
call_if FALSE, EventScript_1A8443
- checkflag FLAG_0x28A
+ checkflag FLAG_SILPH_9F_DOOR_3
call_if FALSE, EventScript_1A847A
- checkflag FLAG_0x28B
+ checkflag FLAG_SILPH_9F_DOOR_4
call_if FALSE, EventScript_1A84A8
end
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-11 10:00:38 +0000