diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-19 20:30:38 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-19 20:30:38 -0400 |
| commit | 2ff8af13d5a259fa0ca07afe3ecf4792b6871a80 (patch) | |
| tree | e787d04143073746d171dcd841b43f95829afc53 /data/maps/Route25_SeaCottage | |
| parent | a8b767965a92352de03780fb4671d2a469343d28 (diff) | |
Hide/show flags through 07F
Diffstat (limited to 'data/maps/Route25_SeaCottage')
| -rw-r--r-- | data/maps/Route25_SeaCottage/map.json | 4 | ||||
| -rw-r--r-- | data/maps/Route25_SeaCottage/scripts.inc | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json index fc102e8e5..ac63be354 100644 --- a/data/maps/Route25_SeaCottage/map.json +++ b/data/maps/Route25_SeaCottage/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route25_SeaCottage_EventScript_17054B", - "flag": "FLAG_0x033" + "flag": "FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE" }, { "graphics_id": "MAP_OBJ_GFX_CLEFAIRY", @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route25_SeaCottage_EventScript_17054B", - "flag": "FLAG_0x032" + "flag": "FLAG_HIDE_BILL_CLEFAIRY" } ], "warp_events": [ diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index d613b42a5..fb6df4c12 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -10,18 +10,18 @@ Route25_SeaCottage_MapScript1_170529:: @ 8170529 end EventScript_17053C:: @ 817053C - clearflag FLAG_0x032 + clearflag FLAG_HIDE_BILL_CLEFAIRY setobjectxyperm 1, 3, 3 return EventScript_170547:: @ 8170547 - setflag FLAG_0x003 + setflag FLAG_TEMP_3 return Route25_SeaCottage_EventScript_17054B:: @ 817054B lock faceplayer - checkflag FLAG_0x003 + checkflag FLAG_TEMP_3 goto_if_eq EventScript_1706C8 checkflag FLAG_0x234 goto_if_eq EventScript_170640 @@ -66,7 +66,7 @@ EventScript_17059C:: @ 817059C playse SE_C_MAKU_D closedoor 10, 3 waitdooranim - setflag FLAG_0x002 + setflag FLAG_TEMP_2 release end @@ -116,7 +116,7 @@ EventScript_17064A:: @ 817064A additem ITEM_SS_TICKET, 1 giveitemfanfaremsg gUnknown_81A028E, ITEM_SS_TICKET, 1, MUS_FAN5 setflag FLAG_0x235 - setflag FLAG_0x031 + setflag FLAG_HIDE_NUGGET_BRIDGE_ROCKET setflag FLAG_0x234 setflag FLAG_SYS_NOT_SOMEONES_PC goto EventScript_170640 @@ -159,9 +159,9 @@ Movement_1706DB:: @ 81706DB Route25_SeaCottage_EventScript_1706DD:: @ 81706DD lockall - checkflag FLAG_0x003 + checkflag FLAG_TEMP_3 goto_if_eq EventScript_1707CA - checkflag FLAG_0x002 + checkflag FLAG_TEMP_2 goto_if_eq EventScript_1706FA msgbox gUnknown_81A0402 releaseall @@ -171,7 +171,7 @@ EventScript_1706FA:: @ 81706FA fadeoutbgm 0 msgbox gUnknown_81A042D closemessage - clearflag FLAG_0x002 + clearflag FLAG_TEMP_2 setflag FLAG_0x233 special SpawnScriptFieldObject applymovement 127, Movement_1707BE @@ -203,7 +203,7 @@ EventScript_1706FA:: @ 81706FA waitdooranim fadeinbgm 0 addobject 1 - clearflag FLAG_0x033 + clearflag FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE delay 50 playfanfare MUS_FANFA1 applymovement 1, Movement_170888 |