ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-25 19:24:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Document map name popup flag

Browse Source
This commit is contained in:
Phlosioneer 2019-03-10 08:10:59 -04:00 committed by huderlem
parent 32f71b2976
commit 8e1537fb57
15 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/event_scripts.s
View File

@ -3161,7 +3161,7 @@ Route118_EventScript_273D13:: @ 8273D13
Route125_EventScript_273D13:: @ 8273D13 Route125_EventScript_273D13:: @ 8273D13
Route127_EventScript_273D13:: @ 8273D13 Route127_EventScript_273D13:: @ 8273D13
Route129_EventScript_273D13:: @ 8273D13 Route129_EventScript_273D13:: @ 8273D13
setflag FLAG_SPECIAL_FLAG_0x4000 setflag FLAG_HIDE_MAP_NAME_POPUP
return return
UnusualWeather_StartKyogreWeather:: @ 8273D17 UnusualWeather_StartKyogreWeather:: @ 8273D17
@ -3188,7 +3188,7 @@ UnusualWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31
special DrawWholeMapView special DrawWholeMapView
setvar VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE setvar VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE
setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 0 setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 0
clearflag FLAG_SPECIAL_FLAG_0x4000 clearflag FLAG_HIDE_MAP_NAME_POPUP
fadescreenswapbuffers 0 fadescreenswapbuffers 0
releaseall releaseall
end end

2
data/maps/InsideOfTruck/scripts.inc
View File

@ -15,7 +15,7 @@ InsideOfTruck_MapScript1_23BF01: @ 823BF01
InsideOfTruck_EventScript_23BF04:: @ 823BF04 InsideOfTruck_EventScript_23BF04:: @ 823BF04
lockall lockall
setflag FLAG_SPECIAL_FLAG_0x4000 setflag FLAG_HIDE_MAP_NAME_POPUP
checkplayergender checkplayergender
compare VAR_RESULT, MALE compare VAR_RESULT, MALE
goto_if_eq InsideOfTruck_EventScript_23BF20 goto_if_eq InsideOfTruck_EventScript_23BF20

4
data/maps/LavaridgeTown/scripts.inc
View File

@ -37,7 +37,7 @@ LavaridgeTown_EventScript_1EA53F:: @ 81EA53F
return return
LavaridgeTown_EventScript_1EA543:: @ 81EA543 LavaridgeTown_EventScript_1EA543:: @ 81EA543
setflag FLAG_SPECIAL_FLAG_0x4000 setflag FLAG_HIDE_MAP_NAME_POPUP
return return
LavaridgeTown_MapScript2_1EA547: @ 81EA547 LavaridgeTown_MapScript2_1EA547: @ 81EA547
@ -95,7 +95,7 @@ LavaridgeTown_EventScript_1EA5FF:: @ 81EA5FF
call_if_ne LavaridgeTown_EventScript_1EA6C9 call_if_ne LavaridgeTown_EventScript_1EA6C9
removeobject 7 removeobject 7
setvar VAR_LAVARIDGE_RIVAL_STATE, 2 setvar VAR_LAVARIDGE_RIVAL_STATE, 2
clearflag FLAG_SPECIAL_FLAG_0x4000 clearflag FLAG_HIDE_MAP_NAME_POPUP
savebgm MUS_DUMMY savebgm MUS_DUMMY
fadedefaultbgm fadedefaultbgm
releaseall releaseall

6
data/maps/LittlerootTown/scripts.inc
View File

@ -31,7 +31,7 @@ LittlerootTown_EventScript_1E7E45:: @ 81E7E45
return return
LittlerootTown_EventScript_1E7E4B:: @ 81E7E4B LittlerootTown_EventScript_1E7E4B:: @ 81E7E4B
setflag FLAG_SPECIAL_FLAG_0x4000 setflag FLAG_HIDE_MAP_NAME_POPUP
return return
LittlerootTown_EventScript_1E7E4F:: @ 81E7E4F LittlerootTown_EventScript_1E7E4F:: @ 81E7E4F
@ -141,7 +141,7 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17
closedoor VAR_0x8004, VAR_0x8005 closedoor VAR_0x8004, VAR_0x8005
waitdooranim waitdooranim
clearflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN clearflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN
clearflag FLAG_SPECIAL_FLAG_0x4000 clearflag FLAG_HIDE_MAP_NAME_POPUP
return return
LittlerootTown_Movement_1E7F98: @ 81E7F98 LittlerootTown_Movement_1E7F98: @ 81E7F98
@ -194,7 +194,7 @@ LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1
clearflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL clearflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL
clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH
delay 20 delay 20
clearflag FLAG_SPECIAL_FLAG_0x4000 clearflag FLAG_HIDE_MAP_NAME_POPUP
warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5
waitstate waitstate
releaseall releaseall

8
data/maps/PetalburgCity/scripts.inc
View File

@ -20,7 +20,7 @@ PetalburgCity_EventScript_1DC307:: @ 81DC307
return return
PetalburgCity_EventScript_1DC30F:: @ 81DC30F PetalburgCity_EventScript_1DC30F:: @ 81DC30F
setflag FLAG_SPECIAL_FLAG_0x4000 setflag FLAG_HIDE_MAP_NAME_POPUP
savebgm MUS_TSURETEK savebgm MUS_TSURETEK
return return
@ -48,7 +48,7 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E
waitmovement 2, MAP_PETALBURG_CITY waitmovement 2, MAP_PETALBURG_CITY
msgbox PetalburgCity_Text_1EC297, MSGBOX_DEFAULT msgbox PetalburgCity_Text_1EC297, MSGBOX_DEFAULT
closemessage closemessage
clearflag FLAG_SPECIAL_FLAG_0x4000 clearflag FLAG_HIDE_MAP_NAME_POPUP
setvar VAR_PETALBURG_STATE, 3 setvar VAR_PETALBURG_STATE, 3
fadedefaultbgm fadedefaultbgm
clearflag FLAG_SPECIAL_FLAG_0x4001 clearflag FLAG_SPECIAL_FLAG_0x4001
@ -61,7 +61,7 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E
PetalburgCity_EventScript_1DC390:: @ 81DC390 PetalburgCity_EventScript_1DC390:: @ 81DC390
lockall lockall
setflag FLAG_SPECIAL_FLAG_0x4000 setflag FLAG_HIDE_MAP_NAME_POPUP
applymovement 5, PetalburgCity_Movement_1DC41B applymovement 5, PetalburgCity_Movement_1DC41B
applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC406 applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC406
waitmovement 0 waitmovement 0
@ -76,7 +76,7 @@ PetalburgCity_EventScript_1DC390:: @ 81DC390
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
closedoor VAR_0x8004, VAR_0x8005 closedoor VAR_0x8004, VAR_0x8005
waitdooranim waitdooranim
clearflag FLAG_SPECIAL_FLAG_0x4000 clearflag FLAG_HIDE_MAP_NAME_POPUP
fadedefaultbgm fadedefaultbgm
clearflag FLAG_SPECIAL_FLAG_0x4001 clearflag FLAG_SPECIAL_FLAG_0x4001
warp MAP_PETALBURG_CITY_WALLYS_HOUSE, 255, 2, 4 warp MAP_PETALBURG_CITY_WALLYS_HOUSE, 255, 2, 4

4
data/maps/Route101/scripts.inc
View File

@ -12,7 +12,7 @@ Route101_MapScript2_1EBCCB: @ 81EBCCB
.2byte 0 .2byte 0
Route101_EventScript_1EBCD5:: @ 81EBCD5 Route101_EventScript_1EBCD5:: @ 81EBCD5
setflag FLAG_SPECIAL_FLAG_0x4000 setflag FLAG_HIDE_MAP_NAME_POPUP
setvar VAR_ROUTE101_STATE, 1 setvar VAR_ROUTE101_STATE, 1
end end
@ -236,7 +236,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16
setflag FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG setflag FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG
setvar VAR_BIRCH_LAB_STATE, 2 setvar VAR_BIRCH_LAB_STATE, 2
setvar VAR_ROUTE101_STATE, 3 setvar VAR_ROUTE101_STATE, 3
clearflag FLAG_SPECIAL_FLAG_0x4000 clearflag FLAG_HIDE_MAP_NAME_POPUP
checkplayergender checkplayergender
compare VAR_RESULT, MALE compare VAR_RESULT, MALE
call_if_eq Route101_EventScript_1EBE85 call_if_eq Route101_EventScript_1EBE85

2
data/maps/Route128/scripts.inc
View File

@ -73,7 +73,7 @@ Route128_EventScript_1F6B57:: @ 81F6B57
delay 15 delay 15
removeobject 3 removeobject 3
waitfieldeffect 30 waitfieldeffect 30
clearflag FLAG_SPECIAL_FLAG_0x4000 clearflag FLAG_HIDE_MAP_NAME_POPUP
setvar VAR_ROUTE128_STATE, 2 setvar VAR_ROUTE128_STATE, 2
releaseall releaseall
end end

4
data/maps/RustboroCity/scripts.inc
View File

@ -24,7 +24,7 @@ RustboroCity_EventScript_1E06FF:: @ 81E06FF
end end
RustboroCity_EventScript_1E0707:: @ 81E0707 RustboroCity_EventScript_1E0707:: @ 81E0707
setflag FLAG_SPECIAL_FLAG_0x4000 setflag FLAG_HIDE_MAP_NAME_POPUP
return return
RustboroCity_MapScript2_1E070B: @ 81E070B RustboroCity_MapScript2_1E070B: @ 81E070B
@ -100,7 +100,7 @@ RustboroCity_EventScript_1E07BD:: @ 81E07BD
removeobject 15 removeobject 15
setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST
setvar VAR_RUSTBORO_STATE, 7 setvar VAR_RUSTBORO_STATE, 7
clearflag FLAG_SPECIAL_FLAG_0x4000 clearflag FLAG_HIDE_MAP_NAME_POPUP
releaseall releaseall
end end

2
data/maps/SeafloorCavern_Room9/scripts.inc
View File

@ -140,7 +140,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS
setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1 setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1
setflag FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS setflag FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS
setflag FLAG_SPECIAL_FLAG_0x4000 setflag FLAG_HIDE_MAP_NAME_POPUP
warp MAP_ROUTE128, 255, 38, 22 warp MAP_ROUTE128, 255, 38, 22
waitstate waitstate
releaseall releaseall

4
data/maps/SkyPillar_Outside/scripts.inc
View File

@ -12,7 +12,7 @@ SkyPillar_Outside_MapScript1_2392B8: @ 82392B8
end end
SkyPillar_Outside_EventScript_2392CF:: @ 82392CF SkyPillar_Outside_EventScript_2392CF:: @ 82392CF
setflag FLAG_SPECIAL_FLAG_0x4000 setflag FLAG_HIDE_MAP_NAME_POPUP
return return
SkyPillar_Outside_EventScript_2392D3:: @ 82392D3 SkyPillar_Outside_EventScript_2392D3:: @ 82392D3
@ -81,7 +81,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
closemessage closemessage
playse SE_KAIDAN playse SE_KAIDAN
fadescreenswapbuffers 1 fadescreenswapbuffers 1
clearflag FLAG_SPECIAL_FLAG_0x4000 clearflag FLAG_HIDE_MAP_NAME_POPUP
setvar VAR_RAYQUAZA_STATE, 4 setvar VAR_RAYQUAZA_STATE, 4
removeobject 1 removeobject 1
clearflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE clearflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE

4
data/maps/SlateportCity/scripts.inc
View File

@ -36,7 +36,7 @@ SlateportCity_EventScript_1DCC99:: @ 81DCC99
return return
SlateportCity_EventScript_1DCCE7:: @ 81DCCE7 SlateportCity_EventScript_1DCCE7:: @ 81DCCE7
setflag FLAG_SPECIAL_FLAG_0x4000 setflag FLAG_HIDE_MAP_NAME_POPUP
getplayerxy VAR_0x8004, VAR_0x8005 getplayerxy VAR_0x8004, VAR_0x8005
compare VAR_0x8004, 30 compare VAR_0x8004, 30
goto_if_eq SlateportCity_EventScript_1DCD06 goto_if_eq SlateportCity_EventScript_1DCD06
@ -83,7 +83,7 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C
removeobject 35 removeobject 35
setobjectxyperm 35, 10, 12 setobjectxyperm 35, 10, 12
setobjectmovementtype 35, MOVEMENT_TYPE_FACE_DOWN setobjectmovementtype 35, MOVEMENT_TYPE_FACE_DOWN
clearflag FLAG_SPECIAL_FLAG_0x4000 clearflag FLAG_HIDE_MAP_NAME_POPUP
setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 2 setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 2
addvar VAR_SCOTT_STATE, 1 addvar VAR_SCOTT_STATE, 1
releaseall releaseall

10
data/maps/SootopolisCity/scripts.inc
View File

@ -62,7 +62,7 @@ SootopolisCity_MapScript1_1E56EF: @ 81E56EF
end end
SootopolisCity_EventScript_1E5781:: @ 81E5781 SootopolisCity_EventScript_1E5781:: @ 81E5781
setflag FLAG_SPECIAL_FLAG_0x4000 setflag FLAG_HIDE_MAP_NAME_POPUP
return return
SootopolisCity_EventScript_1E5785:: @ 81E5785 SootopolisCity_EventScript_1E5785:: @ 81E5785
@ -272,7 +272,7 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946
waitmovement 0 waitmovement 0
special RemoveCameraObject special RemoveCameraObject
setvar VAR_RAYQUAZA_STATE, 2 setvar VAR_RAYQUAZA_STATE, 2
clearflag FLAG_SPECIAL_FLAG_0x4000 clearflag FLAG_HIDE_MAP_NAME_POPUP
releaseall releaseall
end end
@ -372,7 +372,7 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82
waitmovement 0 waitmovement 0
special RemoveCameraObject special RemoveCameraObject
setvar VAR_RAYQUAZA_STATE, 2 setvar VAR_RAYQUAZA_STATE, 2
clearflag FLAG_SPECIAL_FLAG_0x4000 clearflag FLAG_HIDE_MAP_NAME_POPUP
releaseall releaseall
end end
@ -544,7 +544,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS
fadenewbgm MUS_RUNECITY fadenewbgm MUS_RUNECITY
delay 120 delay 120
clearflag FLAG_SPECIAL_FLAG_0x4000 clearflag FLAG_HIDE_MAP_NAME_POPUP
warp8 MAP_SOOTOPOLIS_CITY, 255, 43, 32 warp8 MAP_SOOTOPOLIS_CITY, 255, 43, 32
waitstate waitstate
end end
@ -597,7 +597,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS
fadenewbgm MUS_NAMINORI fadenewbgm MUS_NAMINORI
delay 120 delay 120
clearflag FLAG_SPECIAL_FLAG_0x4000 clearflag FLAG_HIDE_MAP_NAME_POPUP
warp8 MAP_SOOTOPOLIS_CITY, 255, 29, 53 warp8 MAP_SOOTOPOLIS_CITY, 255, 29, 53
waitstate waitstate
end end

2
include/constants/flags.h
View File

@ -1548,7 +1548,7 @@
// Special Flags (Unknown) // Special Flags (Unknown)
#define SPECIAL_FLAGS_START 0x4000 #define SPECIAL_FLAGS_START 0x4000
#define FLAG_SPECIAL_FLAG_0x4000 0x4000 #define FLAG_HIDE_MAP_NAME_POPUP 0x4000
#define FLAG_SPECIAL_FLAG_0x4001 0x4001 #define FLAG_SPECIAL_FLAG_0x4001 0x4001
#define FLAG_SPECIAL_FLAG_0x4002 0x4002 #define FLAG_SPECIAL_FLAG_0x4002 0x4002
#define FLAG_SPECIAL_FLAG_0x4003 0x4003 #define FLAG_SPECIAL_FLAG_0x4003 0x4003

4
src/field_special_scene.c
View File

@ -301,7 +301,7 @@ void Task_HandlePorthole(u8 taskId)
break; break;
case EXIT_PORTHOLE: // exit porthole. case EXIT_PORTHOLE: // exit porthole.
FlagClear(FLAG_SPECIAL_FLAG_0x4001); FlagClear(FLAG_SPECIAL_FLAG_0x4001);
FlagClear(FLAG_SPECIAL_FLAG_0x4000); FlagClear(FLAG_HIDE_MAP_NAME_POPUP);
SetWarpDestinationToDynamicWarp(0); SetWarpDestinationToDynamicWarp(0);
DoDiveWarp(); DoDiveWarp();
DestroyTask(taskId); DestroyTask(taskId);
@ -338,7 +338,7 @@ void sub_80FB7A4(void)
{ {
FlagSet(FLAG_SYS_CRUISE_MODE); FlagSet(FLAG_SYS_CRUISE_MODE);
FlagSet(FLAG_SPECIAL_FLAG_0x4001); FlagSet(FLAG_SPECIAL_FLAG_0x4001);
FlagSet(FLAG_SPECIAL_FLAG_0x4000); FlagSet(FLAG_HIDE_MAP_NAME_POPUP);
SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1);
sub_80FB59C(); sub_80FB59C();
sub_80AF8B8(); sub_80AF8B8();

2
src/map_name_popup.c
View File

@ -207,7 +207,7 @@ bool8 sub_80D47D4(void)
void ShowMapNamePopup(void) void ShowMapNamePopup(void)
{ {
if (FlagGet(FLAG_SPECIAL_FLAG_0x4000) != TRUE) if (FlagGet(FLAG_HIDE_MAP_NAME_POPUP) != TRUE)
{ {
if (!FuncIsActiveTask(Task_MapNamePopUpWindow)) if (!FuncIsActiveTask(Task_MapNamePopUpWindow))
{ {