From 830ed2026fe0fb0d950bb5ddcf11b18ddef405f1 Mon Sep 17 00:00:00 2001 From: Rena <8904131+xyRena@users.noreply.github.com> Date: Wed, 4 May 2022 20:07:09 -0500 Subject: [PATCH] Rename FLAG_CAUGHT_SUICINE This flag was improperly named; it is set when Suicune is caught and prevents Suicune from being regenerated in the Burned Tower after defeating the Elite Four. It is not just a flag that is set when the static Suicune on Route 25 is engaged. --- files/fielddata/script/scr_seq/scr_seq_0024_D18R0102.s | 2 +- files/fielddata/script/scr_seq/scr_seq_0216_R25.s | 2 +- files/fielddata/script/scr_seq/scr_seq_0825_T10R0701.s | 2 +- include/constants/flags.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/files/fielddata/script/scr_seq/scr_seq_0024_D18R0102.s b/files/fielddata/script/scr_seq/scr_seq_0024_D18R0102.s index 7d0296f12..c0c3ee861 100644 --- a/files/fielddata/script/scr_seq/scr_seq_0024_D18R0102.s +++ b/files/fielddata/script/scr_seq/scr_seq_0024_D18R0102.s @@ -250,6 +250,6 @@ _035C: end _0362: - setflag FLAG_ENGAGED_STATIC_SUICUNE + setflag FLAG_CAUGHT_SUICINE return .balign 4, 0 diff --git a/files/fielddata/script/scr_seq/scr_seq_0216_R25.s b/files/fielddata/script/scr_seq/scr_seq_0216_R25.s index 55e3b9c16..2994df434 100644 --- a/files/fielddata/script/scr_seq/scr_seq_0216_R25.s +++ b/files/fielddata/script/scr_seq/scr_seq_0216_R25.s @@ -576,7 +576,7 @@ _07AA: end _07B0: - setflag FLAG_ENGAGED_STATIC_SUICUNE + setflag FLAG_CAUGHT_SUICINE return _07B6: 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 0136fe590..ecb0194cc 100644 --- a/files/fielddata/script/scr_seq/scr_seq_0825_T10R0701.s +++ b/files/fielddata/script/scr_seq/scr_seq_0825_T10R0701.s @@ -59,7 +59,7 @@ _009A: call_if_unset FLAG_CAUGHT_MOLTRES, _0206 goto_if_unset FLAG_CAUGHT_SNORLAX, _020C _0105: - call_if_unset FLAG_ENGAGED_STATIC_SUICUNE, _0227 + call_if_unset FLAG_CAUGHT_SUICINE, _0227 get_game_version VAR_TEMP_x4000 compare VAR_TEMP_x4000, 7 goto_if_ne _012D diff --git a/include/constants/flags.h b/include/constants/flags.h index 306efbdd2..5ab70a158 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -390,7 +390,7 @@ #define FLAG_UNK_172 0x172 #define FLAG_CAUGHT_SNORLAX 0x173 #define FLAG_UNK_174 0x174 -#define FLAG_ENGAGED_STATIC_SUICUNE 0x175 +#define FLAG_CAUGHT_SUICINE 0x175 #define FLAG_UNK_176 0x176 #define FLAG_UNK_177 0x177 #define FLAG_UNK_178 0x178