diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-06 02:34:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-06 02:34:54 -0500 |
| commit | c51e0f3bae824a4c099bdcb0f938e298ef49fdcb (patch) | |
| tree | 8825791d67d44b905e63ea59311c3d85711ac140 /data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc | |
| parent | cb90f22c5e632cf8161ae2c3246d8d1f205ce39f (diff) | |
| parent | 7beddd16dd81d79ee886183053037e68910e01d5 (diff) | |
Merge branch 'master' into fix-eventobj
Diffstat (limited to 'data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc')
| -rw-r--r-- | data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc b/data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc index e12e51188..f59661f64 100644 --- a/data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc @@ -11,8 +11,7 @@ BattleFrontier_BattlePikeRoomWildMons_MapScript2_25E42A: @ 825E42A BattleFrontier_BattlePikeRoomWildMons_EventScript_25E43C:: @ 825E43C setvar VAR_TEMP_0, 1 - setvar VAR_0x8004, BATTLE_PIKE_FUNC_6 - special CallBattlePikeFunction + pike_inwildmonroom end BattleFrontier_BattlePikeRoomWildMons_EventScript_25E44A:: @ 825E44A |