diff options
Diffstat (limited to 'data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc')
| -rw-r--r-- | data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc | 57 |
1 files changed, 17 insertions, 40 deletions
diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc index 1bcf1814a..02384c332 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc @@ -17,7 +17,6 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D:: @ 8252A5D setvar VAR_0x8006, 1 setvar VAR_0x8007, 55 setvar VAR_RESULT, 0 - BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77:: @ 8252A77 special CallBattlePyramidFunction delay 2 @@ -40,32 +39,26 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98:: @ 8252A98 BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_FLOOR_PALETTE special CallBattlePyramidFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_0 - special CallFrontierUtilFunc + frontier_getstatus switch VAR_TEMP_0 case 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D - case 1, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66 - case 2, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 5 - special CallFrontierUtilFunc - compare VAR_RESULT, 4 + case CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66 + case CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D + frontier_get FRONTIER_DATA_BATTLE_OUTCOME + compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 - compare VAR_RESULT, 5 + compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 - compare VAR_RESULT, 2 + compare VAR_RESULT, B_OUTCOME_LOST goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 - compare VAR_RESULT, 3 + compare VAR_RESULT, B_OUTCOME_DREW goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 - compare VAR_RESULT, 9 + compare VAR_RESULT, B_OUTCOME_FORFEITED goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_CHECK_BATTLE_TYPE - setvar VAR_0x8005, BATTLE_TYPE_TRAINER - special CallFrontierUtilFunc + frontier_isbattletype BATTLE_TYPE_TRAINER @ VAR_RESULT seems to be ignored here setvar VAR_TEMP_D, 1 - BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39:: @ 8252B39 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_RESTORE_PARTY special CallBattlePyramidFunction @@ -73,10 +66,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39:: @ 8252B39 BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42:: @ 8252B42 BattleFrontier_BattlePyramidTop_EventScript_252B42:: @ 8252B42 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 4 - special CallFrontierUtilFunc + frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA setvar VAR_0x8005, 7 setvar VAR_0x8006, 255 @@ -100,15 +90,10 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D setvar VAR_0x8005, 1 special CallBattlePyramidFunction special SavePlayerParty - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special CallFrontierUtilFunc + frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS special CallBattlePyramidFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY - setvar VAR_0x8005, FRONTIER_PARTY_SIZE - special CallFrontierUtilFunc + frontier_setpartyorder FRONTIER_PARTY_SIZE setvar VAR_TEMP_F, 1 end @@ -125,23 +110,15 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5:: @ 8252BD5 return BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8 - call BattleFrontier_BattlePalaceBattleRoom_EventScript_241EBA - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_1 - setvar VAR_0x8005, 2 - special CallFrontierUtilFunc + call BattleFrontier_EventScript_IncrementWinStreak + frontier_get FRONTIER_DATA_BATTLE_NUM @ Floor number addvar VAR_RESULT, 1 - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 2 - copyvar VAR_0x8006, VAR_RESULT - special CallFrontierUtilFunc + frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT compare VAR_RESULT, 7 goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SEED_FLOOR special CallBattlePyramidFunction - setvar VAR_0x8004, FRONTIER_UTIL_FUNC_2 - setvar VAR_0x8005, 0 - setvar VAR_0x8006, 0 - special CallFrontierUtilFunc + frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 setvar VAR_RESULT, 0 warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1 waitstate |