summaryrefslogtreecommitdiff
path: root/data/scripts/maps
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/maps')
-rw-r--r--data/scripts/maps/FallarborTown_House1.inc6
-rw-r--r--data/scripts/maps/FallarborTown_House2.inc4
-rw-r--r--data/scripts/maps/LilycoveCity_ContestLobby.inc16
-rw-r--r--data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc6
-rw-r--r--data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc4
-rw-r--r--data/scripts/maps/OldaleTown.inc4
-rw-r--r--data/scripts/maps/Route104_PrettyPetalFlowerShop.inc4
-rw-r--r--data/scripts/maps/Route109_SeashoreHouse.inc4
-rw-r--r--data/scripts/maps/Route111_WinstrateFamilysHouse.inc4
-rw-r--r--data/scripts/maps/Route130.inc30
-rw-r--r--data/scripts/maps/RusturfTunnel.inc4
-rw-r--r--data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc2
12 files changed, 44 insertions, 44 deletions
diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc
index 0228fe25d..8e4b8bda3 100644
--- a/data/scripts/maps/FallarborTown_House1.inc
+++ b/data/scripts/maps/FallarborTown_House1.inc
@@ -18,9 +18,9 @@ FallarborTown_House1_EventScript_153BB5:: @ 8153BB5
end
FallarborTown_House1_EventScript_153BDA:: @ 8153BDA
- checkflag 2
+ checkflag FLAG_TEMP_2
call_if 0, FallarborTown_House1_EventScript_153C2D
- checkflag 2
+ checkflag FLAG_TEMP_2
call_if 1, FallarborTown_House1_EventScript_153C3E
compare RESULT, 0
goto_if_eq FallarborTown_House1_EventScript_153C47
@@ -45,7 +45,7 @@ FallarborTown_House1_EventScript_153C3E:: @ 8153C3E
return
FallarborTown_House1_EventScript_153C47:: @ 8153C47
- setflag 2
+ setflag FLAG_TEMP_2
msgbox FallarborTown_House1_Text_17797D, 4
release
end
diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc
index 3b215a697..c827eea7b 100644
--- a/data/scripts/maps/FallarborTown_House2.inc
+++ b/data/scripts/maps/FallarborTown_House2.inc
@@ -5,10 +5,10 @@ FallarborTown_House2_EventScript_153C91:: @ 8153C91
lockall
applymovement 1, FallarborTown_House2_Movement_1A0839
waitmovement 0
- checkflag 1
+ checkflag FLAG_TEMP_1
goto_if_eq FallarborTown_House2_EventScript_153CB6
msgbox FallarborTown_House2_Text_177AF4, 4
- setflag 1
+ setflag FLAG_TEMP_1
goto FallarborTown_House2_EventScript_153CB6
end
diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc
index 656516fd6..470af3871 100644
--- a/data/scripts/maps/LilycoveCity_ContestLobby.inc
+++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc
@@ -307,11 +307,11 @@ LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85
checkitem ITEM_CONTEST_PASS, 1
compare RESULT, 0
goto_if_eq LilycoveCity_ContestLobby_EventScript_158BBA
- checkflag 2
+ checkflag FLAG_TEMP_2
goto_if_eq LilycoveCity_ContestLobby_EventScript_158BAE
message LilycoveCity_ContestLobby_Text_18848C
waitmessage
- setflag 2
+ setflag FLAG_TEMP_2
goto LilycoveCity_ContestLobby_EventScript_158BF0
end
@@ -334,7 +334,7 @@ LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4
erasebox 0, 0, 15, 9
compare RESULT, 0
goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35
- setflag 3
+ setflag FLAG_TEMP_3
return
LilycoveCity_ContestLobby_EventScript_158BF0:: @ 8158BF0
@@ -354,7 +354,7 @@ LilycoveCity_ContestLobby_EventScript_158C27:: @ 8158C27
LilycoveCity_ContestLobby_EventScript_158C35:: @ 8158C35
msgbox LilycoveCity_ContestLobby_Text_188559, 4
releaseall
- clearflag 3
+ clearflag FLAG_TEMP_3
end
LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42
@@ -402,7 +402,7 @@ LilycoveCity_ContestLobby_EventScript_158CC0:: @ 8158CC0
end
LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA
- checkflag 3
+ checkflag FLAG_TEMP_3
call_if 0, LilycoveCity_ContestLobby_EventScript_158BC4
message LilycoveCity_ContestLobby_Text_1886DC
waitmessage
@@ -445,7 +445,7 @@ LilycoveCity_ContestLobby_EventScript_158D90:: @ 8158D90
msgbox LilycoveCity_ContestLobby_Text_18878D, 4
closemessage
releaseall
- clearflag 3
+ clearflag FLAG_TEMP_3
end
LilycoveCity_ContestLobby_EventScript_158DA1:: @ 8158DA1
@@ -453,7 +453,7 @@ LilycoveCity_ContestLobby_EventScript_158DA1:: @ 8158DA1
msgbox LilycoveCity_ContestLobby_Text_1887F4, 4
closemessage
releaseall
- clearflag 3
+ clearflag FLAG_TEMP_3
end
LilycoveCity_ContestLobby_EventScript_158DB2:: @ 8158DB2
@@ -461,7 +461,7 @@ LilycoveCity_ContestLobby_EventScript_158DB2:: @ 8158DB2
msgbox LilycoveCity_ContestLobby_Text_18881F, 4
closemessage
releaseall
- clearflag 3
+ clearflag FLAG_TEMP_3
end
LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3
diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
index fd9ea8a58..00a10b655 100644
--- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
+++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
@@ -4,9 +4,9 @@ LilycoveCity_CoveLilyMotel_2F_MapScripts:: @ 81583A0
LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1
lock
faceplayer
- checkflag 2
+ checkflag FLAG_TEMP_2
call_if 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7
- checkflag 2
+ checkflag FLAG_TEMP_2
call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD
specialvar RESULT, sub_8090FC0
compare RESULT, 1
@@ -19,7 +19,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7:: @ 81583C7
return
LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0:: @ 81583D0
- setflag 2
+ setflag FLAG_TEMP_2
playfanfare 370
waitfanfare
goto LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
index 0e6bdc140..ca60bbc89 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
+++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
@@ -4,7 +4,7 @@ LilycoveCity_DepartmentStoreElevator_MapScripts:: @ 815A39B
LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C
lock
faceplayer
- checkflag 2
+ checkflag FLAG_TEMP_2
call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF
copyvar 0x8005, 0x4043
special sub_810E944
@@ -76,7 +76,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8:: @ 815A4B8
waitmovement 0
special sub_810EBEC
waitstate
- setflag 2
+ setflag FLAG_TEMP_2
return
LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF:: @ 815A4CF
diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc
index e80df2cd2..1ac72a727 100644
--- a/data/scripts/maps/OldaleTown.inc
+++ b/data/scripts/maps/OldaleTown.inc
@@ -40,9 +40,9 @@ OldaleTown_EventScript_14DDBC:: @ 814DDBC
faceplayer
checkflag 132
goto_if_eq OldaleTown_EventScript_14DE79
- checkflag 1
+ checkflag FLAG_TEMP_1
goto_if_eq OldaleTown_EventScript_14DE79
- setflag 1
+ setflag FLAG_TEMP_1
playbgm 420, 0
msgbox OldaleTown_Text_16AEF2, 4
closemessage
diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
index 4c5becf88..34cc8e85d 100644
--- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
+++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
@@ -8,7 +8,7 @@ Route104_PrettyPetalFlowerShop_MapScript1_15BDEA:: @ 815BDEA
goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03
checkflag 2057
goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03
- setflag 1
+ setflag FLAG_TEMP_1
end
Route104_PrettyPetalFlowerShop_EventScript_15BE03:: @ 815BE03
@@ -18,7 +18,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE03:: @ 815BE03
Route104_PrettyPetalFlowerShop_EventScript_15BE0B:: @ 815BE0B
lock
faceplayer
- checkflag 1
+ checkflag FLAG_TEMP_1
goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE7C
msgbox Route104_PrettyPetalFlowerShop_Text_1C5EC6, 4
checkflag 127
diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc
index 4d8d363aa..50278c024 100644
--- a/data/scripts/maps/Route109_SeashoreHouse.inc
+++ b/data/scripts/maps/Route109_SeashoreHouse.inc
@@ -13,10 +13,10 @@ Route109_SeashoreHouse_EventScript_160DD4:: @ 8160DD4
goto_if_eq Route109_SeashoreHouse_EventScript_160E36
checkflag 141
goto_if_eq Route109_SeashoreHouse_EventScript_160E08
- checkflag 2
+ checkflag FLAG_TEMP_2
goto_if_eq Route109_SeashoreHouse_EventScript_160DFE
msgbox Route109_SeashoreHouse_Text_19B4D9, 4
- setflag 2
+ setflag FLAG_TEMP_2
release
end
diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc
index d9a94ce75..acd145dc3 100644
--- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc
+++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc
@@ -40,10 +40,10 @@ Route111_WinstrateFamilysHouse_EventScript_15BF95:: @ 815BF95
lock
faceplayer
setvar 0x8008, 4
- checkflag 4
+ checkflag FLAG_TEMP_4
goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BFB6
msgbox Route111_WinstrateFamilysHouse_Text_192219, 4
- setflag 4
+ setflag FLAG_TEMP_4
goto Route111_WinstrateFamilysHouse_EventScript_15BFC4
end
diff --git a/data/scripts/maps/Route130.inc b/data/scripts/maps/Route130.inc
index 69da29471..897047edc 100644
--- a/data/scripts/maps/Route130.inc
+++ b/data/scripts/maps/Route130.inc
@@ -6,21 +6,21 @@ Route130_MapScript1_1523C8:: @ 81523C8
specialvar RESULT, IsMirageIslandPresent
compare RESULT, 1
goto_if_eq Route130_EventScript_15240C
- setflag 17
- setflag 18
- setflag 19
- setflag 20
- setflag 21
- setflag 22
- setflag 23
- setflag 24
- setflag 25
- setflag 26
- setflag 27
- setflag 28
- setflag 29
- setflag 30
- setflag 31
+ setflag FLAG_TEMP_11
+ setflag FLAG_TEMP_12
+ setflag FLAG_TEMP_13
+ setflag FLAG_TEMP_14
+ setflag FLAG_TEMP_15
+ setflag FLAG_TEMP_16
+ setflag FLAG_TEMP_17
+ setflag FLAG_TEMP_18
+ setflag FLAG_TEMP_19
+ setflag FLAG_TEMP_1A
+ setflag FLAG_TEMP_1B
+ setflag FLAG_TEMP_1C
+ setflag FLAG_TEMP_1D
+ setflag FLAG_TEMP_1E
+ setflag FLAG_TEMP_1F
setflag 32
setmaplayoutindex 264
end
diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc
index 28f6f0ad4..98061b926 100644
--- a/data/scripts/maps/RusturfTunnel.inc
+++ b/data/scripts/maps/RusturfTunnel.inc
@@ -32,9 +32,9 @@ RusturfTunnel_EventScript_15C782:: @ 815C782
RusturfTunnel_EventScript_15C799:: @ 815C799
lock
faceplayer
- checkflag 1
+ checkflag FLAG_TEMP_1
goto_if_eq RusturfTunnel_EventScript_15C7BC
- setflag 1
+ setflag FLAG_TEMP_1
msgbox RusturfTunnel_Text_1944C5, 4
closemessage
applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D
diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc
index 52d430db5..ab1e1ad7b 100644
--- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc
+++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc
@@ -43,7 +43,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076
compare RESULT, 0
goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_1A029B
msgbox ShoalCave_LowTideEntranceRoom_Text_1C688E, 4
- setflag 2
+ setflag FLAG_TEMP_2
release
end
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-20 19:24:18 +0000