diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-10 20:43:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-10 20:43:27 -0500 |
| commit | 47b0d8a5970a75862279bde9d19a06c3d7f96eee (patch) | |
| tree | 462ebc6e6bce61be28d862cd89c8bec08ebfa61e /data/maps/BattleFrontier_BattlePyramidTop | |
| parent | 77bf40d32b7bbab40db36030399586430ae57010 (diff) | |
| parent | 49f1a90534180445d293761e2bdac165b49319a2 (diff) | |
Merge branch 'master' into doc-matchcall
Diffstat (limited to 'data/maps/BattleFrontier_BattlePyramidTop')
| -rw-r--r-- | data/maps/BattleFrontier_BattlePyramidTop/scripts.inc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc index 0a48184b3..2e6b8f3a2 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc @@ -6,10 +6,7 @@ BattleFrontier_BattlePyramidTop_MapScripts:: @ 82550A1 .byte 0 BattleFrontier_BattlePyramidTop_MapScript1_2550B6: @ 82550B6 - setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT - setvar VAR_0x8005, 200 - setvar VAR_0x8006, 0 - special CallBattlePyramidFunction + pyramid_updatelight 200, PYRAMID_LIGHT_SET_RADIUS setvar VAR_TEMP_F, 1 end @@ -64,13 +61,10 @@ BattleFrontier_BattlePyramidTop_EventScript_25518A:: @ 825518A end BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193 - setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_3 - setvar VAR_0x8005, 1 - special CallBattlePyramidFunction + pyramid_save CHALLENGE_STATUS_SAVING special SavePlayerParty frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 - setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS - special CallBattlePyramidFunction + pyramid_inittrainers frontier_setpartyorder FRONTIER_PARTY_SIZE setvar VAR_TEMP_F, 1 end |