diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-20 18:02:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-20 18:02:50 -0400 |
| commit | aeeff84462973b267e62031a945603d96afed716 (patch) | |
| tree | 046ce2a73b467844e95a490b1cfa9cdda5e5f4df /src/field_specials.c | |
| parent | d3bfb6cfc63f9f64295cbd864f98df9cf4c643b4 (diff) | |
| parent | f0bf1e641cb8532611c97354beaf46afaca7c417 (diff) | |
Merge pull request #780 from GriffinRichards/sync-scripts
Sync some scripts with pokeemerald
Diffstat (limited to 'src/field_specials.c')
| -rw-r--r-- | src/field_specials.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/field_specials.c b/src/field_specials.c index 972b63a0d..38a0bd50b 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -722,7 +722,7 @@ void CableCarWarp(void) } } -void SetFlagInVar(void) +void SetHiddenItemFlag(void) { FlagSet(gSpecialVar_0x8004); } @@ -1791,7 +1791,7 @@ bool8 IsPokerusInParty(void) static void sub_810F7A8(u8); static void sub_810F814(u8); -void sub_810F758(void) +void ShakeCamera(void) { u8 taskId = CreateTask(sub_810F7A8, 9); gTasks[taskId].data[0] = gSpecialVar_0x8005; @@ -1966,7 +1966,7 @@ void sub_810FA74(void) } } -void sub_810FAA0(void) +void UpdateTrainerFanClubGameClear(void) { if (!((gSaveBlock1.vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] >> 7) & 1)) { |