diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-12-25 15:03:13 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-12-25 15:03:13 -0600 |
| commit | d8948a5cda2e385c1d4b5c6190c4fe0fb53359fb (patch) | |
| tree | fa882b0733f88cc17dcbaef8c25c30c7198bdca1 /data/maps/BattleFrontier_BattlePyramidEmptySquare | |
| parent | dea41e1a7e6e73789431153d6c28dac3a3a73ac6 (diff) | |
| parent | a54aa03d20dacc88879404b87a5f6a7eb7babc54 (diff) | |
Merge remote-tracking branch 'pret/master' into trade
Diffstat (limited to 'data/maps/BattleFrontier_BattlePyramidEmptySquare')
| -rw-r--r-- | data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc index d6d53bc2f..558f6e416 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc @@ -22,7 +22,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77:: @ 8252A77 special CallBattlePyramidFunction delay 2 compare VAR_RESULT, 2 - goto_if 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77 + goto_if_ne BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77 setvar VAR_TEMP_D, 0 releaseall end @@ -50,17 +50,17 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2 setvar VAR_0x8005, 5 special CallFrontierUtilFunc compare VAR_RESULT, 4 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 + goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 compare VAR_RESULT, 5 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 + goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 compare VAR_RESULT, 0 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 + goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 compare VAR_RESULT, 2 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 + goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 compare VAR_RESULT, 3 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 + goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 compare VAR_RESULT, 9 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 + goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 setvar VAR_0x8004, 14 setvar VAR_0x8005, 8 special CallFrontierUtilFunc @@ -135,7 +135,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc compare VAR_RESULT, 7 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45 + goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45 setvar VAR_0x8004, 6 special CallBattlePyramidFunction setvar VAR_0x8004, 2 @@ -167,7 +167,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A:: @ 8252C6A special CallBattlePyramidFunction callstd STD_FIND_ITEM compare VAR_0x8007, 0 - goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87 + goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87 setvar VAR_0x8004, 8 special CallBattlePyramidFunction |