diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-11-12 11:37:18 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-12 11:37:18 -0600 |
| commit | 54ad6794bce3ee534aa78a8c6e7f32715cd8f6a9 (patch) | |
| tree | 3f1dee86f96098d38131426e11a0f9c39a1244fe /data | |
| parent | 65f053fd89e09b13e407ac53488043b728660e6e (diff) | |
| parent | 1b895ff52c011d51a9516791148cd5088ba411b5 (diff) | |
Merge pull request #361 from Slawter666/synchronise
Synchronise with pokeruby
Diffstat (limited to 'data')
| -rw-r--r-- | data/event_scripts.s | 2 | ||||
| -rw-r--r-- | data/specials.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 8fb50a92b..c2926ce92 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -3325,7 +3325,7 @@ EventScript_2736B3:: @ 82736B3 EventScript_Poison:: @ 82736BC lockall - special sub_80F972C + special ExecuteWhiteOut waitstate compare VAR_RESULT, 1 goto_eq EventScript_2736D9 diff --git a/data/specials.inc b/data/specials.inc index 5c1653d49..a06b98b3d 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -210,7 +210,7 @@ gSpecials:: @ 81DBA64 def_special ShowLinkBattleRecords def_special IsEnoughForCostInVar0x8005 def_special SubtractMoneyFromVar0x8005 - def_special sub_80F972C + def_special ExecuteWhiteOut def_special sp0C8_whiteout_maybe def_special RotatingGate_InitPuzzle def_special RotatingGate_InitPuzzleAndGraphics |