diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-20 09:25:55 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-20 09:25:55 -0400 |
| commit | b3951b48ecf169463d917c3fca9c218e16fe961e (patch) | |
| tree | d7af72846070be3f25d72fcb275422233a9c989a | |
| parent | 9d8c5b22506ee867785012db89a9ab1c3006179a (diff) | |
fix FLAG_DEFEATED_RIVAL to FLAG_DEFEATED_CHAMP
| -rw-r--r-- | data/event_scripts.s | 2 | ||||
| -rw-r--r-- | data/maps/PokemonLeague_ChampionsRoom/scripts.inc | 2 | ||||
| -rw-r--r-- | include/constants/flags.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index f0aab14b1..a63d06538 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1570,7 +1570,7 @@ EventScript_1A6551:: @ 81A6551 clearflag FLAG_DEFEATED_BRUNO clearflag FLAG_DEFEATED_AGATHA clearflag FLAG_DEFEATED_LANCE - clearflag FLAG_DEFEATED_RIVAL + clearflag FLAG_DEFEATED_CHAMP cleartrainerflag TRAINER_CHAMPION_TERRY cleartrainerflag TRAINER_CHAMPION_TERRY_2 cleartrainerflag TRAINER_CHAMPION_TERRY_3 diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index fe3de6e9f..f3835ed30 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -75,7 +75,7 @@ EventScript_162B76:: @ 8162B76 call_if 1, EventScript_162C91 setflag FLAG_TEMP_4 clearflag FLAG_TEMP_5 - setflag FLAG_DEFEATED_RIVAL + setflag FLAG_DEFEATED_CHAMP setflag FLAG_TEMP_4 msgbox gUnknown_8178F2F playbgm MUS_SLOWMASARA, 0 diff --git a/include/constants/flags.h b/include/constants/flags.h index c08193c53..b38c79938 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1235,7 +1235,7 @@ #define FLAG_DEFEATED_BRUNO 0x4B9 #define FLAG_DEFEATED_AGATHA 0x4BA #define FLAG_DEFEATED_LANCE 0x4BB -#define FLAG_DEFEATED_RIVAL 0x4BC +#define FLAG_DEFEATED_CHAMP 0x4BC // Unused? #define FLAG_0x4BD 0x4BD |