From a7e16b4d485ee67f55759499ea8712b35cf84747 Mon Sep 17 00:00:00 2001 From: Rena <8904131+xyRena@users.noreply.github.com> Date: Wed, 4 May 2022 22:09:40 -0500 Subject: [PATCH] Define Embedded Tower flags and variables --- .../eventdata/zone_event/146_R47.json | 2 +- .../eventdata/zone_event/250_D48R0101.json | 2 +- .../eventdata/zone_event/476_D52R0101.json | 4 +-- .../eventdata/zone_event/477_D52R0102.json | 4 +-- .../eventdata/zone_event/478_D52R0103.json | 2 +- .../script/scr_seq/scr_seq_0121_D48R0101.s | 12 ++++----- .../script/scr_seq/scr_seq_0133_D52R0101.s | 26 +++++++++---------- .../script/scr_seq/scr_seq_0134_D52R0102.s | 26 +++++++++---------- .../script/scr_seq/scr_seq_0135_D52R0103.s | 14 +++++----- .../script/scr_seq/scr_seq_0229_R30R0201.s | 8 +++--- .../script/scr_seq/scr_seq_0260_R47.s | 12 ++++----- .../scr_seq/scr_seq_0382_D48R0101_hdr.s | 2 +- .../scr_seq/scr_seq_0396_D52R0103_hdr.s | 2 +- .../scr_seq/scr_seq_0474_R30R0201_hdr.s | 2 +- .../script/scr_seq/scr_seq_0740_T01R0301.s | 12 ++++----- .../script/scr_seq/scr_seq_0825_T10R0701.s | 18 ++++++++----- include/constants/flags.h | 24 ++++++++--------- include/constants/vars.h | 2 +- 18 files changed, 90 insertions(+), 84 deletions(-) diff --git a/files/fielddata/eventdata/zone_event/146_R47.json b/files/fielddata/eventdata/zone_event/146_R47.json index ff709c2e5..48626f5e8 100644 --- a/files/fielddata/eventdata/zone_event/146_R47.json +++ b/files/fielddata/eventdata/zone_event/146_R47.json @@ -92,7 +92,7 @@ "ovid": "SPRITE_MOUNT_2", "mvt": 0, "type": 0, - "flag": "FLAG_UNK_2CF", + "flag": "FLAG_HIDE_ROUTE_47_EMBEDDED_TOWER_HIKER", "scr": "_EV_scr_seq_R47_001 + 1", "dirn": 3, "eye": 0, diff --git a/files/fielddata/eventdata/zone_event/250_D48R0101.json b/files/fielddata/eventdata/zone_event/250_D48R0101.json index 2c1c16447..c61a96efd 100644 --- a/files/fielddata/eventdata/zone_event/250_D48R0101.json +++ b/files/fielddata/eventdata/zone_event/250_D48R0101.json @@ -91,7 +91,7 @@ "ovid": "SPRITE_GSLEADER5", "mvt": 17, "type": 0, - "flag": "FLAG_UNK_2CE", + "flag": "FLAG_HIDE_CLIFFS_EDGE_GATE_CHUCK", "scr": 0, "dirn": 3, "eye": 0, diff --git a/files/fielddata/eventdata/zone_event/476_D52R0101.json b/files/fielddata/eventdata/zone_event/476_D52R0101.json index 49b9c26e5..66efd90ae 100644 --- a/files/fielddata/eventdata/zone_event/476_D52R0101.json +++ b/files/fielddata/eventdata/zone_event/476_D52R0101.json @@ -6,7 +6,7 @@ "ovid": "SPRITE_TSURE_POKE_STATIC_GROUDON", "mvt": 0, "type": 0, - "flag": "FLAG_UNK_2D0", + "flag": "FLAG_HIDE_EMBEDDED_TOWER_GROUDON", "scr": "_EV_scr_seq_D52R0101_000 + 1", "dirn": 1, "eye": 0, @@ -23,7 +23,7 @@ "ovid": "SPRITE_MOUNT_2", "mvt": 0, "type": 0, - "flag": "FLAG_UNK_2D3", + "flag": "FLAG_HIDE_EMBEDDED_TOWER_GROUDON_HIKER", "scr": 0, "dirn": 0, "eye": 0, diff --git a/files/fielddata/eventdata/zone_event/477_D52R0102.json b/files/fielddata/eventdata/zone_event/477_D52R0102.json index 2cdd57220..37bd75399 100644 --- a/files/fielddata/eventdata/zone_event/477_D52R0102.json +++ b/files/fielddata/eventdata/zone_event/477_D52R0102.json @@ -6,7 +6,7 @@ "ovid": "SPRITE_TSURE_POKE_STATIC_KYOGRE", "mvt": 0, "type": 0, - "flag": "FLAG_UNK_2D1", + "flag": "FLAG_HIDE_EMBEDDED_TOWER_KYOGRE", "scr": "_EV_scr_seq_D52R0102_000 + 1", "dirn": 1, "eye": 0, @@ -23,7 +23,7 @@ "ovid": "SPRITE_MOUNT_2", "mvt": 0, "type": 0, - "flag": "FLAG_UNK_2D4", + "flag": "FLAG_HIDE_EMBEDDED_TOWER_KYOGRE_HIKER", "scr": 0, "dirn": 0, "eye": 0, diff --git a/files/fielddata/eventdata/zone_event/478_D52R0103.json b/files/fielddata/eventdata/zone_event/478_D52R0103.json index b768898cd..c01731a2d 100644 --- a/files/fielddata/eventdata/zone_event/478_D52R0103.json +++ b/files/fielddata/eventdata/zone_event/478_D52R0103.json @@ -6,7 +6,7 @@ "ovid": "SPRITE_TSURE_POKE_STATIC_RAYQUAZA", "mvt": 0, "type": 0, - "flag": "FLAG_UNK_2D2", + "flag": "FLAG_HIDE_EMBEDDED_TOWER_RAYQUAZA", "scr": "_EV_scr_seq_D52R0103_000 + 1", "dirn": 1, "eye": 0, diff --git a/files/fielddata/script/scr_seq/scr_seq_0121_D48R0101.s b/files/fielddata/script/scr_seq/scr_seq_0121_D48R0101.s index f245aff75..c367f89d4 100644 --- a/files/fielddata/script/scr_seq/scr_seq_0121_D48R0101.s +++ b/files/fielddata/script/scr_seq/scr_seq_0121_D48R0101.s @@ -15,17 +15,17 @@ scrdef_end scr_seq_D48R0101_005: - compare VAR_UNK_40F9, 2 + compare VAR_SCENE_EMBEDDED_TOWER, 2 goto_if_eq _0031 - setflag FLAG_UNK_2CE + setflag FLAG_HIDE_CLIFFS_EDGE_GATE_CHUCK end _0031: - clearflag FLAG_UNK_2CE + clearflag FLAG_HIDE_CLIFFS_EDGE_GATE_CHUCK end scr_seq_D48R0101_006: - compare VAR_UNK_40F9, 2 + compare VAR_SCENE_EMBEDDED_TOWER, 2 goto_if_eq _0046 end @@ -87,9 +87,9 @@ _010F: _0117: wait_movement play_se SEQ_SE_DP_KAIDAN2 - setflag FLAG_UNK_2CE + setflag FLAG_HIDE_CLIFFS_EDGE_GATE_CHUCK hide_person obj_D48R0101_gsleader5 - setvar VAR_UNK_40F9, 3 + setvar VAR_SCENE_EMBEDDED_TOWER, 3 releaseall end .byte 0x00 diff --git a/files/fielddata/script/scr_seq/scr_seq_0133_D52R0101.s b/files/fielddata/script/scr_seq/scr_seq_0133_D52R0101.s index 358ec6f63..71ba59937 100644 --- a/files/fielddata/script/scr_seq/scr_seq_0133_D52R0101.s +++ b/files/fielddata/script/scr_seq/scr_seq_0133_D52R0101.s @@ -11,7 +11,7 @@ scrdef_end scr_seq_D52R0101_001: - compare VAR_UNK_40F9, 4 + compare VAR_SCENE_EMBEDDED_TOWER, 4 goto_if_ge _007C get_game_version VAR_TEMP_x4000 compare VAR_TEMP_x4000, 7 @@ -22,20 +22,20 @@ _0038: goto _004A .byte 0x02, 0x00 _0040: - setflag FLAG_UNK_2D0 - setflag FLAG_UNK_2D3 + setflag FLAG_HIDE_EMBEDDED_TOWER_GROUDON + setflag FLAG_HIDE_EMBEDDED_TOWER_GROUDON_HIKER end _004A: - goto_if_set FLAG_UNK_18B, _007C + goto_if_set FLAG_BEAT_OR_ESCAPED_FROM_GROUDON_OR_KYOGRE, _007C hasitem ITEM_RED_ORB, 1, VAR_TEMP_x4000 compare VAR_TEMP_x4000, 1 goto_if_ge _0072 goto _0040 .byte 0x02, 0x00 _0072: - setflag FLAG_UNK_2D3 - clearflag FLAG_UNK_2D0 + setflag FLAG_HIDE_EMBEDDED_TOWER_GROUDON_HIKER + clearflag FLAG_HIDE_EMBEDDED_TOWER_GROUDON end _007C: @@ -46,7 +46,7 @@ scr_seq_D52R0101_002: end _008B: - setflag FLAG_UNK_2D0 + setflag FLAG_HIDE_EMBEDDED_TOWER_GROUDON hide_person obj_D52R0101_tsure_poke_static_groudon clearflag FLAG_ENGAGING_STATIC_POKEMON end @@ -74,14 +74,14 @@ _00EC: npc_msg msg_0148_D52R0101_00001 wait_button_or_walk_away closemsg - setflag FLAG_UNK_18B + setflag FLAG_BEAT_OR_ESCAPED_FROM_GROUDON_OR_KYOGRE releaseall end _00FB: - setvar VAR_UNK_40F9, 4 - setflag FLAG_UNK_179 - clearflag FLAG_UNK_2D3 + setvar VAR_SCENE_EMBEDDED_TOWER, 4 + setflag FLAG_CAUGHT_GROUDON + clearflag FLAG_HIDE_EMBEDDED_TOWER_GROUDON_HIKER show_person obj_D52R0101_mount_2 scrcmd_602 0 scrcmd_603 @@ -117,8 +117,8 @@ _0156: apply_movement obj_D52R0101_mount_2, _01EC wait_movement hide_person obj_D52R0101_mount_2 - setflag FLAG_UNK_2D3 - setflag FLAG_UNK_2CF + setflag FLAG_HIDE_EMBEDDED_TOWER_GROUDON_HIKER + setflag FLAG_HIDE_ROUTE_47_EMBEDDED_TOWER_HIKER releaseall end diff --git a/files/fielddata/script/scr_seq/scr_seq_0134_D52R0102.s b/files/fielddata/script/scr_seq/scr_seq_0134_D52R0102.s index 93d950a66..cf388d839 100644 --- a/files/fielddata/script/scr_seq/scr_seq_0134_D52R0102.s +++ b/files/fielddata/script/scr_seq/scr_seq_0134_D52R0102.s @@ -11,7 +11,7 @@ scrdef_end scr_seq_D52R0102_001: - compare VAR_UNK_40F9, 4 + compare VAR_SCENE_EMBEDDED_TOWER, 4 goto_if_ge _007C get_game_version VAR_TEMP_x4000 compare VAR_TEMP_x4000, 7 @@ -22,20 +22,20 @@ _0038: goto _0040 .byte 0x02, 0x00 _0040: - setflag FLAG_UNK_2D1 - setflag FLAG_UNK_2D4 + setflag FLAG_HIDE_EMBEDDED_TOWER_KYOGRE + setflag FLAG_HIDE_EMBEDDED_TOWER_KYOGRE_HIKER end _004A: - goto_if_set FLAG_UNK_18B, _007C + goto_if_set FLAG_BEAT_OR_ESCAPED_FROM_GROUDON_OR_KYOGRE, _007C hasitem ITEM_BLUE_ORB, 1, VAR_TEMP_x4000 compare VAR_TEMP_x4000, 1 goto_if_ge _0072 goto _0040 .byte 0x02, 0x00 _0072: - setflag FLAG_UNK_2D4 - clearflag FLAG_UNK_2D1 + setflag FLAG_HIDE_EMBEDDED_TOWER_KYOGRE_HIKER + clearflag FLAG_HIDE_EMBEDDED_TOWER_KYOGRE end _007C: @@ -46,7 +46,7 @@ scr_seq_D52R0102_002: end _008B: - setflag FLAG_UNK_2D1 + setflag FLAG_HIDE_EMBEDDED_TOWER_KYOGRE hide_person obj_D52R0102_tsure_poke_static_kyogre clearflag FLAG_ENGAGING_STATIC_POKEMON end @@ -74,14 +74,14 @@ _00EC: npc_msg msg_0149_D52R0102_00001 wait_button_or_walk_away closemsg - setflag FLAG_UNK_18B + setflag FLAG_BEAT_OR_ESCAPED_FROM_GROUDON_OR_KYOGRE releaseall end _00FB: - setvar VAR_UNK_40F9, 4 - setflag FLAG_UNK_17A - clearflag FLAG_UNK_2D4 + setvar VAR_SCENE_EMBEDDED_TOWER, 4 + setflag FLAG_CAUGHT_KYOGRE + clearflag FLAG_HIDE_EMBEDDED_TOWER_KYOGRE_HIKER show_person obj_D52R0102_mount_2 scrcmd_602 0 scrcmd_603 @@ -117,8 +117,8 @@ _0156: apply_movement obj_D52R0102_mount_2, _01EC wait_movement hide_person obj_D52R0102_mount_2 - setflag FLAG_UNK_2D4 - setflag FLAG_UNK_2CF + setflag FLAG_HIDE_EMBEDDED_TOWER_KYOGRE_HIKER + setflag FLAG_HIDE_ROUTE_47_EMBEDDED_TOWER_HIKER releaseall end diff --git a/files/fielddata/script/scr_seq/scr_seq_0135_D52R0103.s b/files/fielddata/script/scr_seq/scr_seq_0135_D52R0103.s index d86fe4096..2dc05efc0 100644 --- a/files/fielddata/script/scr_seq/scr_seq_0135_D52R0103.s +++ b/files/fielddata/script/scr_seq/scr_seq_0135_D52R0103.s @@ -16,14 +16,14 @@ scr_seq_D52R0103_002: end _001F: - setflag FLAG_UNK_2D2 + setflag FLAG_HIDE_EMBEDDED_TOWER_RAYQUAZA hide_person obj_D52R0103_tsure_poke_static_rayquaza end scr_seq_D52R0103_003: - compare VAR_UNK_40F9, 7 + compare VAR_SCENE_EMBEDDED_TOWER, 7 goto_if_ge _003C - clearflag FLAG_UNK_2D2 + clearflag FLAG_HIDE_EMBEDDED_TOWER_RAYQUAZA end _003C: @@ -57,7 +57,7 @@ scr_seq_D52R0103_001: wait_cry lock obj_D52R0103_tsure_poke_static_rayquaza closemsg - setvar VAR_UNK_40F9, 6 + setvar VAR_SCENE_EMBEDDED_TOWER, 6 releaseall end .byte 0x00, 0x00, 0x00 @@ -91,13 +91,13 @@ _0123: npc_msg msg_0150_D52R0103_00001 wait_button_or_walk_away closemsg - setvar VAR_UNK_40F9, 9 + setvar VAR_SCENE_EMBEDDED_TOWER, 9 releaseall end _0134: - setvar VAR_UNK_40F9, 7 - setflag FLAG_UNK_17B + setvar VAR_SCENE_EMBEDDED_TOWER, 7 + setflag FLAG_CAUGHT_RAYQUAZA releaseall end diff --git a/files/fielddata/script/scr_seq/scr_seq_0229_R30R0201.s b/files/fielddata/script/scr_seq/scr_seq_0229_R30R0201.s index b89f25b93..ce618a2bf 100644 --- a/files/fielddata/script/scr_seq/scr_seq_0229_R30R0201.s +++ b/files/fielddata/script/scr_seq/scr_seq_0229_R30R0201.s @@ -12,7 +12,7 @@ scrdef_end scr_seq_R30R0201_003: - compare VAR_UNK_40F9, 1 + compare VAR_SCENE_EMBEDDED_TOWER, 1 goto_if_eq _0021 end @@ -61,9 +61,9 @@ scr_seq_R30R0201_000: play_se SEQ_SE_DP_SELECT lockall faceplayer - compare VAR_UNK_40F9, 4 + compare VAR_SCENE_EMBEDDED_TOWER, 4 goto_if_ge _00F1 - compare VAR_UNK_40F9, 2 + compare VAR_SCENE_EMBEDDED_TOWER, 2 goto_if_ge _02CD _00F1: goto_if_set FLAG_EXCHANGED_RED_SCALE, _019F @@ -160,7 +160,7 @@ _0220: scr_seq_R30R0201_002: scrcmd_609 lockall - setvar VAR_UNK_40F9, 2 + setvar VAR_SCENE_EMBEDDED_TOWER, 2 apply_movement obj_R30R0201_gsgentleman, _03AC wait_movement apply_movement obj_R30R0201_gsgentleman, _02D8 diff --git a/files/fielddata/script/scr_seq/scr_seq_0260_R47.s b/files/fielddata/script/scr_seq/scr_seq_0260_R47.s index bd9a7ea74..799f5bb8c 100644 --- a/files/fielddata/script/scr_seq/scr_seq_0260_R47.s +++ b/files/fielddata/script/scr_seq/scr_seq_0260_R47.s @@ -28,11 +28,11 @@ _004F: move_warp 5, 87, 385 move_warp 6, 87, 385 _0067: - compare VAR_UNK_40F9, 2 + compare VAR_SCENE_EMBEDDED_TOWER, 2 goto_if_eq _00E6 - compare VAR_UNK_40F9, 3 + compare VAR_SCENE_EMBEDDED_TOWER, 3 goto_if_eq _00E6 - compare VAR_UNK_40F9, 5 + compare VAR_SCENE_EMBEDDED_TOWER, 5 goto_if_ge _00EC goto_if_unset FLAG_UNK_189, _009F clearflag FLAG_UNK_189 @@ -68,7 +68,7 @@ _00EC: goto _00E6 .byte 0x02, 0x00 scr_seq_R47_002: - compare VAR_UNK_40F9, 5 + compare VAR_SCENE_EMBEDDED_TOWER, 5 goto_if_ge _0162 get_game_version VAR_TEMP_x4000 compare VAR_TEMP_x4000, 7 @@ -95,11 +95,11 @@ scr_seq_R47_001: play_se SEQ_SE_DP_SELECT lockall faceplayer - goto_if_set FLAG_UNK_151, _019E + goto_if_set FLAG_MET_ROUTE_47_EMBEDDED_TOWER_HIKER, _019E npc_msg msg_0407_R47_00000 wait_button_or_walk_away closemsg - setflag FLAG_UNK_151 + setflag FLAG_MET_ROUTE_47_EMBEDDED_TOWER_HIKER releaseall end diff --git a/files/fielddata/script/scr_seq/scr_seq_0382_D48R0101_hdr.s b/files/fielddata/script/scr_seq/scr_seq_0382_D48R0101_hdr.s index df94934a8..825f14771 100644 --- a/files/fielddata/script/scr_seq/scr_seq_0382_D48R0101_hdr.s +++ b/files/fielddata/script/scr_seq/scr_seq_0382_D48R0101_hdr.s @@ -12,7 +12,7 @@ .byte 0 scr_seq_D48R0101_map_scripts_2: - .short VAR_UNK_40F9, 2, _EV_scr_seq_D48R0101_004 + 1 + .short VAR_SCENE_EMBEDDED_TOWER, 2, _EV_scr_seq_D48R0101_004 + 1 .short 0 .balign 4, 0 diff --git a/files/fielddata/script/scr_seq/scr_seq_0396_D52R0103_hdr.s b/files/fielddata/script/scr_seq/scr_seq_0396_D52R0103_hdr.s index 270236449..6ab0749e8 100644 --- a/files/fielddata/script/scr_seq/scr_seq_0396_D52R0103_hdr.s +++ b/files/fielddata/script/scr_seq/scr_seq_0396_D52R0103_hdr.s @@ -12,7 +12,7 @@ .byte 0 scr_seq_D52R0103_map_scripts_2: - .short VAR_UNK_40F9, 5, _EV_scr_seq_D52R0103_001 + 1 + .short VAR_SCENE_EMBEDDED_TOWER, 5, _EV_scr_seq_D52R0103_001 + 1 .short 0 .balign 4, 0 diff --git a/files/fielddata/script/scr_seq/scr_seq_0474_R30R0201_hdr.s b/files/fielddata/script/scr_seq/scr_seq_0474_R30R0201_hdr.s index a96e2b953..797010000 100644 --- a/files/fielddata/script/scr_seq/scr_seq_0474_R30R0201_hdr.s +++ b/files/fielddata/script/scr_seq/scr_seq_0474_R30R0201_hdr.s @@ -10,7 +10,7 @@ .byte 0 scr_seq_R30R0201_map_scripts_2: - .short VAR_UNK_40F9, 1, _EV_scr_seq_R30R0201_002 + 1 + .short VAR_SCENE_EMBEDDED_TOWER, 1, _EV_scr_seq_R30R0201_002 + 1 .short VAR_SCENE_MR_POKEMONS_HOUSE, 0, _EV_scr_seq_R30R0201_001 + 1 .short 0 diff --git a/files/fielddata/script/scr_seq/scr_seq_0740_T01R0301.s b/files/fielddata/script/scr_seq/scr_seq_0740_T01R0301.s index 5d2071e3f..5b8bdc256 100644 --- a/files/fielddata/script/scr_seq/scr_seq_0740_T01R0301.s +++ b/files/fielddata/script/scr_seq/scr_seq_0740_T01R0301.s @@ -99,11 +99,11 @@ scr_seq_T01R0301_000: goto_if_eq _0277 compare VAR_UNK_4131, 2 goto_if_eq _026C - compare VAR_UNK_40F9, 7 + compare VAR_SCENE_EMBEDDED_TOWER, 7 goto_if_eq _04B1 - compare VAR_UNK_40F9, 5 + compare VAR_SCENE_EMBEDDED_TOWER, 5 goto_if_eq _04A6 - compare VAR_UNK_40F9, 4 + compare VAR_SCENE_EMBEDDED_TOWER, 4 goto_if_eq _02CB goto_if_set FLAG_GOT_HM08, _01B2 goto_if_set FLAG_UNK_12A, _0195 @@ -329,7 +329,7 @@ _047E: closemsg npc_msg msg_0451_T01R0301_00021 closemsg - setvar VAR_UNK_40F9, 5 + setvar VAR_SCENE_EMBEDDED_TOWER, 5 goto _01B2 _04A6: @@ -340,7 +340,7 @@ _04A6: _04B1: npc_msg msg_0451_T01R0301_00023 closemsg - setvar VAR_UNK_40F9, 8 + setvar VAR_SCENE_EMBEDDED_TOWER, 8 goto _01B2 _04C2: @@ -614,7 +614,7 @@ _0912: closemsg releaseall copyvar VAR_UNK_4131, VAR_SPECIAL_x8006 - setvar VAR_UNK_40F9, 1 + setvar VAR_SCENE_EMBEDDED_TOWER, 1 return _0929: diff --git a/files/fielddata/script/scr_seq/scr_seq_0825_T10R0701.s b/files/fielddata/script/scr_seq/scr_seq_0825_T10R0701.s index ecb0194cc..fb0f3e339 100644 --- a/files/fielddata/script/scr_seq/scr_seq_0825_T10R0701.s +++ b/files/fielddata/script/scr_seq/scr_seq_0825_T10R0701.s @@ -69,7 +69,7 @@ _012D: goto _024F _0133: - call_if_unset FLAG_UNK_17B, _0264 + call_if_unset FLAG_CAUGHT_RAYQUAZA, _0264 compare VAR_UNK_4046, 2 call_if_eq _026A compare VAR_UNK_4045, 2 @@ -161,17 +161,23 @@ _0238: return _023A: - goto_if_set FLAG_UNK_17A, _0133 - clearflag FLAG_UNK_18B + goto_if_set FLAG_CAUGHT_KYOGRE, _0133 + clearflag FLAG_BEAT_OR_ESCAPED_FROM_GROUDON_OR_KYOGRE goto _0133 +// This branch is for SoulSilver, so this should be checking +// FLAG_CAUGHT_GROUDON instead of FLAG_CAUGHT_KYOGRE. This problem +// has existed since this file was disassembled and is probably a +// mistake in SoulSilver. Because capturing Groudon sets +// VAR_SCENE_EMBEDDED_TOWER to 4 and the tower does not regenerate +// Groudon if the variable is 4 or more, the mistake has no effect. _024F: - goto_if_set FLAG_UNK_17A, _0133 - clearflag FLAG_UNK_18B + goto_if_set FLAG_CAUGHT_KYOGRE, _0133 + clearflag FLAG_BEAT_OR_ESCAPED_FROM_GROUDON_OR_KYOGRE goto _0133 _0264: - clearflag FLAG_UNK_2D2 + clearflag FLAG_HIDE_EMBEDDED_TOWER_RAYQUAZA return _026A: diff --git a/include/constants/flags.h b/include/constants/flags.h index 1e87a3b83..e166a1b6d 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -354,7 +354,7 @@ #define FLAG_UNK_14E 0x14E #define FLAG_GOT_JUDGE_EXPLANATION 0x14F #define FLAG_UNK_150 0x150 -#define FLAG_UNK_151 0x151 +#define FLAG_MET_ROUTE_47_EMBEDDED_TOWER_HIKER 0x151 #define FLAG_UNK_152 0x152 #define FLAG_UNK_153 0x153 #define FLAG_UNK_154 0x154 @@ -394,9 +394,9 @@ #define FLAG_UNK_176 0x176 #define FLAG_GOT_HOENN_STARTER_FROM_STEVEN 0x177 #define FLAG_UNK_178 0x178 -#define FLAG_UNK_179 0x179 -#define FLAG_UNK_17A 0x17A -#define FLAG_UNK_17B 0x17B +#define FLAG_CAUGHT_GROUDON 0x179 +#define FLAG_CAUGHT_KYOGRE 0x17A +#define FLAG_CAUGHT_RAYQUAZA 0x17B #define FLAG_UNK_17C 0x17C #define FLAG_UNK_17D 0x17D #define FLAG_UNK_17E 0x17E @@ -412,7 +412,7 @@ #define FLAG_UNK_188 0x188 #define FLAG_UNK_189 0x189 #define FLAG_SPECIAL_MART_MT_MOON 0x18A -#define FLAG_UNK_18B 0x18B +#define FLAG_BEAT_OR_ESCAPED_FROM_GROUDON_OR_KYOGRE 0x18B #define FLAG_UNK_18C 0x18C #define FLAG_UNK_18D 0x18D #define FLAG_UNK_18E 0x18E @@ -739,13 +739,13 @@ #define FLAG_UNK_2CB 0x2CB #define FLAG_HIDE_LAKE_OF_RAGE_PRYCE 0x2CC #define FLAG_UNK_2CD 0x2CD -#define FLAG_UNK_2CE 0x2CE -#define FLAG_UNK_2CF 0x2CF -#define FLAG_UNK_2D0 0x2D0 -#define FLAG_UNK_2D1 0x2D1 -#define FLAG_UNK_2D2 0x2D2 -#define FLAG_UNK_2D3 0x2D3 -#define FLAG_UNK_2D4 0x2D4 +#define FLAG_HIDE_CLIFFS_EDGE_GATE_CHUCK 0x2CE +#define FLAG_HIDE_ROUTE_47_EMBEDDED_TOWER_HIKER 0x2CF +#define FLAG_HIDE_EMBEDDED_TOWER_GROUDON 0x2D0 +#define FLAG_HIDE_EMBEDDED_TOWER_KYOGRE 0x2D1 +#define FLAG_HIDE_EMBEDDED_TOWER_RAYQUAZA 0x2D2 +#define FLAG_HIDE_EMBEDDED_TOWER_GROUDON_HIKER 0x2D3 +#define FLAG_HIDE_EMBEDDED_TOWER_KYOGRE_HIKER 0x2D4 #define FLAG_HIDE_POKEATHLON_SHOES_SIGN 0x2D5 #define FLAG_HIDE_POKEATHLON_CLOTHES_SIGN 0x2D6 #define FLAG_HIDE_POKEATHLON_FLAG_SIGN 0x2D7 diff --git a/include/constants/vars.h b/include/constants/vars.h index 009c77feb..34fb70834 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -261,7 +261,7 @@ #define VAR_UNK_40F6 0x40F6 #define VAR_UNK_40F7 0x40F7 #define VAR_UNK_40F8 0x40F8 -#define VAR_UNK_40F9 0x40F9 +#define VAR_SCENE_EMBEDDED_TOWER 0x40F9 #define VAR_UNK_40FA 0x40FA #define VAR_SCENE_SINJOH_MYSTRI_ROOM 0x40FB #define VAR_UNK_40FC 0x40FC