From 2ff8af13d5a259fa0ca07afe3ecf4792b6871a80 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 19 Oct 2019 20:30:38 -0400 Subject: Hide/show flags through 07F --- data/maps/PokemonLeague_ChampionsRoom/map.json | 2 +- data/maps/PokemonLeague_ChampionsRoom/scripts.inc | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'data/maps/PokemonLeague_ChampionsRoom') diff --git a/data/maps/PokemonLeague_ChampionsRoom/map.json b/data/maps/PokemonLeague_ChampionsRoom/map.json index c98a22470..2154adc3a 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/map.json +++ b/data/maps/PokemonLeague_ChampionsRoom/map.json @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "FLAG_0x05A" + "flag": "FLAG_HIDE_OAK_IN_CHAMP_ROOM" } ], "warp_events": [ diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 67b68616d..31549e6ec 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -55,7 +55,7 @@ PokemonLeague_ChampionsRoom_MapScript3_162B6C:: @ 8162B6C EventScript_162B76:: @ 8162B76 lockall textcolor 0 - setflag FLAG_0x002 + setflag FLAG_TEMP_2 applymovement 255, Movement_162D07 waitmovement 0 delay 20 @@ -66,17 +66,17 @@ EventScript_162B76:: @ 8162B76 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if_eq EventScript_162C68 - setflag FLAG_0x003 - setflag FLAG_0x005 + setflag FLAG_TEMP_3 + setflag FLAG_TEMP_5 savebgm MUS_WIN_GYM checkflag FLAG_0x844 call_if 0, EventScript_162C6F checkflag FLAG_0x844 call_if 1, EventScript_162C91 - setflag FLAG_0x004 - clearflag FLAG_0x005 + setflag FLAG_TEMP_4 + clearflag FLAG_TEMP_5 setflag FLAG_0x4BC - setflag FLAG_0x004 + setflag FLAG_TEMP_4 msgbox gUnknown_8178F2F playbgm MUS_SLOWMASARA, 0 addobject 2 -- cgit v1.2.3