summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLOuroboros <lunosouroboros@gmail.com>2020-12-02 01:40:17 -0300
committerLOuroboros <lunosouroboros@gmail.com>2020-12-02 01:53:28 -0300
commit9f14b57f55a360ae07dc9d9593980d2145fc5d99 (patch)
treed30829f6ec4467b7305a73c5365cbd7906046bb8
parent752fdc7c420a0b67ef830df5c92335dfcd610402 (diff)
FLAG_SPECIAL_FLAG_0 -> FLAG_HIDE_MAP_NAME_POPUP
-rw-r--r--data/maps/InsideOfTruck/scripts.inc2
-rw-r--r--data/maps/LittlerootTown/scripts.inc2
-rw-r--r--data/maps/PetalburgCity/scripts.inc4
-rw-r--r--data/maps/Route101/scripts.inc4
-rw-r--r--include/constants/flags.h4
-rw-r--r--src/field_special_scene.c4
-rw-r--r--src/map_name_popup.c2
7 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc
index 2ffdf8a8a..61727f0ec 100644
--- a/data/maps/InsideOfTruck/scripts.inc
+++ b/data/maps/InsideOfTruck/scripts.inc
@@ -15,7 +15,7 @@ InsideOfTruck_MapScript1_15FC26:: @ 815FC26
InsideOfTruck_EventScript_15FC29:: @ 815FC29
lockall
- setflag FLAG_SPECIAL_FLAG_0
+ setflag FLAG_HIDE_MAP_NAME_POPUP
checkplayergender
compare VAR_RESULT, 0
goto_if_eq InsideOfTruck_EventScript_15FC45
diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc
index dcdf452dd..77d85024a 100644
--- a/data/maps/LittlerootTown/scripts.inc
+++ b/data/maps/LittlerootTown/scripts.inc
@@ -127,7 +127,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B
closedoor VAR_0x8004, VAR_0x8005
waitdooranim
clearflag FLAG_HIDE_FAT_MAN_LITTLEROOT
- clearflag FLAG_SPECIAL_FLAG_0
+ clearflag FLAG_HIDE_MAP_NAME_POPUP
return
LittlerootTown_Movement_14D6AC:: @ 814D6AC
diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc
index 6eac0b301..d2b7100bf 100644
--- a/data/maps/PetalburgCity/scripts.inc
+++ b/data/maps/PetalburgCity/scripts.inc
@@ -25,7 +25,7 @@ PetalburgCity_MapScript2_14B73D:: @ 814B73D
PetalburgCity_EventScript_14B747:: @ 814B747
lockall
- setflag FLAG_SPECIAL_FLAG_0
+ setflag FLAG_HIDE_MAP_NAME_POPUP
special SavePlayerParty
special PutZigzagoonInPlayerParty
applymovement 2, PetalburgCity_Movement_14B7ED
@@ -40,7 +40,7 @@ PetalburgCity_EventScript_14B747:: @ 814B747
waitmovement 0, MAP_MAUVILLE_CITY
msgbox PetalburgCity_Text_16D408, MSGBOX_DEFAULT
closemessage
- clearflag FLAG_SPECIAL_FLAG_0
+ clearflag FLAG_HIDE_MAP_NAME_POPUP
setvar VAR_PETALBURG_STATE, 3
fadedefaultbgm
clearflag FLAG_DONT_TRANSITION_MUSIC
diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc
index b042ab903..7f6115973 100644
--- a/data/maps/Route101/scripts.inc
+++ b/data/maps/Route101/scripts.inc
@@ -12,7 +12,7 @@ Route101_MapScript2_14E935:: @ 814E935
.2byte 0
Route101_EventScript_14E93F:: @ 814E93F
- setflag FLAG_SPECIAL_FLAG_0
+ setflag FLAG_HIDE_MAP_NAME_POPUP
setvar VAR_ROUTE101_STATE, 1
end
@@ -235,7 +235,7 @@ Route101_EventScript_14EA7F:: @ 814EA7F
setflag FLAG_HIDE_BIRCH_STARTERS_BAG
setvar VAR_BIRCH_LAB_STATE, 2
setvar VAR_ROUTE101_STATE, 3
- clearflag FLAG_SPECIAL_FLAG_0
+ clearflag FLAG_HIDE_MAP_NAME_POPUP
warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5
waitstate
release
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 0fadd7d93..8b7138092 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -898,9 +898,9 @@
#define FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS (SYSTEM_FLAGS + 0xD2)
// Daily flags end at 0x8FF
-// SPECIAL FLAGS (unknown purpose)
+// SPECIAL FLAGS
-#define FLAG_SPECIAL_FLAG_0 0x4000
+#define FLAG_HIDE_MAP_NAME_POPUP 0x4000
#define FLAG_DONT_TRANSITION_MUSIC 0x4001
#endif // GUARD_CONSTANTS_FLAGS_H
diff --git a/src/field_special_scene.c b/src/field_special_scene.c
index 0fb0ca097..03854a5ff 100644
--- a/src/field_special_scene.c
+++ b/src/field_special_scene.c
@@ -339,7 +339,7 @@ void Task_HandlePorthole(u8 taskId)
break;
case EXIT_PORTHOLE: // exit porthole.
FlagClear(FLAG_DONT_TRANSITION_MUSIC);
- FlagClear(FLAG_SPECIAL_FLAG_0);
+ FlagClear(FLAG_HIDE_MAP_NAME_POPUP);
copy_saved_warp2_bank_and_enter_x_to_warp1(0);
sp13E_warp_to_last_warp();
DestroyTask(taskId);
@@ -376,7 +376,7 @@ void sub_80C7958(void)
{
FlagSet(FLAG_SYS_CRUISE_MODE);
FlagSet(FLAG_DONT_TRANSITION_MUSIC);
- FlagSet(FLAG_SPECIAL_FLAG_0);
+ FlagSet(FLAG_HIDE_MAP_NAME_POPUP);
saved_warp2_set(0, gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum, -1);
sub_80C7754();
sub_8080F9C();
diff --git a/src/map_name_popup.c b/src/map_name_popup.c
index 102254f22..7e4aa60e5 100644
--- a/src/map_name_popup.c
+++ b/src/map_name_popup.c
@@ -19,7 +19,7 @@ bool8 unref_sub_80A2F44(void)
void ShowMapNamePopup(void)
{
- if (FlagGet(FLAG_SPECIAL_FLAG_0) != TRUE)
+ if (FlagGet(FLAG_HIDE_MAP_NAME_POPUP) != TRUE)
{
if (!FuncIsActiveTask(Task_MapNamePopup))
{