diff options
| author | scnorton <scnorton@biociphers.org> | 2017-06-21 12:43:59 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-06-21 12:43:59 -0400 |
| commit | 99f9d40be14633630503ebcd75787fc7fdfe1486 (patch) | |
| tree | c3962867c76bca0f06311bc39791aa42889e877d /src/field_specials.c | |
| parent | 294cbd8beb08b14a24385a78f1a8435f5fbe2f8c (diff) | |
| parent | 42ae04c74fe07d05175efb4df143dbcf1b2752bc (diff) | |
Merge remote-tracking branch 'origin/master' into field_specials
Diffstat (limited to 'src/field_specials.c')
| -rwxr-xr-x | src/field_specials.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field_specials.c b/src/field_specials.c index 13be27dc2..341071570 100755 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -675,7 +675,7 @@ void GetRivalSonDaughterString(void) u8 sub_810E300(void) { - return gUnknown_02024D26; + return gBattleOutcome; } void CableCarWarp(void) @@ -2338,7 +2338,7 @@ void sub_810FEFC(void) if (VarGet(VAR_0x4095) == 2) { sub_810FA74(); - if (gUnknown_02024D26 == 1) + if (gBattleOutcome == 1) { sub_810FB9C(); } |