dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix FLAG_DEFEATED_RIVAL to FLAG_DEFEATED_CHAMP

Browse Source
This commit is contained in:
PikalaxALT
2019-10-20 09:25:55 -04:00
parent 9d8c5b2250
commit b3951b48ec
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_scripts.s
+1 -1
View File
@@ -1570,7 +1570,7 @@ EventScript_1A6551:: @ 81A6551
clearflag FLAG_DEFEATED_BRUNO clearflag FLAG_DEFEATED_BRUNO
clearflag FLAG_DEFEATED_AGATHA clearflag FLAG_DEFEATED_AGATHA
clearflag FLAG_DEFEATED_LANCE clearflag FLAG_DEFEATED_LANCE
clearflag FLAG_DEFEATED_RIVAL clearflag FLAG_DEFEATED_CHAMP
cleartrainerflag TRAINER_CHAMPION_TERRY cleartrainerflag TRAINER_CHAMPION_TERRY
cleartrainerflag TRAINER_CHAMPION_TERRY_2 cleartrainerflag TRAINER_CHAMPION_TERRY_2
cleartrainerflag TRAINER_CHAMPION_TERRY_3 cleartrainerflag TRAINER_CHAMPION_TERRY_3
data/maps/PokemonLeague_ChampionsRoom/scripts.inc
+1 -1
View File
@@ -75,7 +75,7 @@ EventScript_162B76:: @ 8162B76
call_if 1, EventScript_162C91 call_if 1, EventScript_162C91
setflag FLAG_TEMP_4 setflag FLAG_TEMP_4
clearflag FLAG_TEMP_5 clearflag FLAG_TEMP_5
setflag FLAG_DEFEATED_RIVAL setflag FLAG_DEFEATED_CHAMP
setflag FLAG_TEMP_4 setflag FLAG_TEMP_4
msgbox gUnknown_8178F2F msgbox gUnknown_8178F2F
playbgm MUS_SLOWMASARA, 0 playbgm MUS_SLOWMASARA, 0
include/constants/flags.h
+1 -1
View File
@@ -1235,7 +1235,7 @@
#define FLAG_DEFEATED_BRUNO 0x4B9 #define FLAG_DEFEATED_BRUNO 0x4B9
#define FLAG_DEFEATED_AGATHA 0x4BA #define FLAG_DEFEATED_AGATHA 0x4BA
#define FLAG_DEFEATED_LANCE 0x4BB #define FLAG_DEFEATED_LANCE 0x4BB
#define FLAG_DEFEATED_RIVAL 0x4BC #define FLAG_DEFEATED_CHAMP 0x4BC
// Unused? // Unused?
#define FLAG_0x4BD 0x4BD #define FLAG_0x4BD 0x4BD